From 1cb657e02e0dc59b153c898aa9b33edcac843cee Mon Sep 17 00:00:00 2001 From: Adam Lesperance Date: Tue, 21 Feb 2012 14:39:08 -0600 Subject: [PATCH 1/2] Reword default config headers --- akka-actor/src/main/resources/reference.conf | 2 +- akka-agent/src/main/resources/reference.conf | 2 +- akka-cluster/src/main/resources/reference.conf | 2 +- .../akka-beanstalk-mailbox/src/main/resources/reference.conf | 2 +- .../akka-file-mailbox/src/main/resources/reference.conf | 2 +- .../akka-mongo-mailbox/src/main/resources/reference.conf | 2 +- .../akka-redis-mailbox/src/main/resources/reference.conf | 2 +- .../akka-zookeeper-mailbox/src/main/resources/reference.conf | 2 +- akka-remote/src/main/resources/reference.conf | 2 +- akka-testkit/src/main/resources/reference.conf | 2 +- akka-transactor/src/main/resources/reference.conf | 2 +- akka-zeromq/src/main/resources/reference.conf | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/akka-actor/src/main/resources/reference.conf b/akka-actor/src/main/resources/reference.conf index 8240aee4d7..e1a603c971 100644 --- a/akka-actor/src/main/resources/reference.conf +++ b/akka-actor/src/main/resources/reference.conf @@ -2,7 +2,7 @@ # Akka Actor Reference Config File # #################################### -# This the reference config file has all the default settings. +# This is the reference config file that contains all the default settings. # Make your edits/overrides in your application.conf. akka { diff --git a/akka-agent/src/main/resources/reference.conf b/akka-agent/src/main/resources/reference.conf index 2c3b121ba7..cf57b869de 100644 --- a/akka-agent/src/main/resources/reference.conf +++ b/akka-agent/src/main/resources/reference.conf @@ -2,7 +2,7 @@ # Akka Agent Reference Config File # #################################### -# This the reference config file has all the default settings. +# This is the reference config file that contains all the default settings. # Make your edits/overrides in your application.conf. akka { diff --git a/akka-cluster/src/main/resources/reference.conf b/akka-cluster/src/main/resources/reference.conf index e097d34f3e..3142d548b5 100644 --- a/akka-cluster/src/main/resources/reference.conf +++ b/akka-cluster/src/main/resources/reference.conf @@ -2,7 +2,7 @@ # Akka Cluster Reference Config File # ###################################### -# This the reference config file has all the default settings. +# This is the reference config file that contains all the default settings. # Make your edits/overrides in your application.conf. akka { diff --git a/akka-durable-mailboxes/akka-beanstalk-mailbox/src/main/resources/reference.conf b/akka-durable-mailboxes/akka-beanstalk-mailbox/src/main/resources/reference.conf index 82beeeddd8..6ec98a2114 100644 --- a/akka-durable-mailboxes/akka-beanstalk-mailbox/src/main/resources/reference.conf +++ b/akka-durable-mailboxes/akka-beanstalk-mailbox/src/main/resources/reference.conf @@ -2,7 +2,7 @@ # Akka Beanstalk Mailboxes Reference Config File # ################################################## -# This the reference config file has all the default settings. +# This is the reference config file that contains all the default settings. # Make your edits/overrides in your application.conf. akka { diff --git a/akka-durable-mailboxes/akka-file-mailbox/src/main/resources/reference.conf b/akka-durable-mailboxes/akka-file-mailbox/src/main/resources/reference.conf index 93ee52fcc7..9e7069f296 100644 --- a/akka-durable-mailboxes/akka-file-mailbox/src/main/resources/reference.conf +++ b/akka-durable-mailboxes/akka-file-mailbox/src/main/resources/reference.conf @@ -2,7 +2,7 @@ # Akka File Mailboxes Reference Config File # ############################################# -# This the reference config file has all the default settings. +# This is the reference config file that contains all the default settings. # Make your edits/overrides in your application.conf. akka { diff --git a/akka-durable-mailboxes/akka-mongo-mailbox/src/main/resources/reference.conf b/akka-durable-mailboxes/akka-mongo-mailbox/src/main/resources/reference.conf index ad73037960..e4eb631727 100644 --- a/akka-durable-mailboxes/akka-mongo-mailbox/src/main/resources/reference.conf +++ b/akka-durable-mailboxes/akka-mongo-mailbox/src/main/resources/reference.conf @@ -2,7 +2,7 @@ # Akka MongoDB Mailboxes Reference Config File # ################################################ -# This the reference config file has all the default settings. +# This is the reference config file that contains all the default settings. # Make your edits/overrides in your application.conf. akka { diff --git a/akka-durable-mailboxes/akka-redis-mailbox/src/main/resources/reference.conf b/akka-durable-mailboxes/akka-redis-mailbox/src/main/resources/reference.conf index 7b12dc24b2..93c11a2975 100644 --- a/akka-durable-mailboxes/akka-redis-mailbox/src/main/resources/reference.conf +++ b/akka-durable-mailboxes/akka-redis-mailbox/src/main/resources/reference.conf @@ -2,7 +2,7 @@ # Akka Redis Mailboxes Reference Config File # ############################################## -# This the reference config file has all the default settings. +# This is the reference config file that contains all the default settings. # Make your edits/overrides in your application.conf. akka { diff --git a/akka-durable-mailboxes/akka-zookeeper-mailbox/src/main/resources/reference.conf b/akka-durable-mailboxes/akka-zookeeper-mailbox/src/main/resources/reference.conf index 3dfea7a944..4f9a47b084 100644 --- a/akka-durable-mailboxes/akka-zookeeper-mailbox/src/main/resources/reference.conf +++ b/akka-durable-mailboxes/akka-zookeeper-mailbox/src/main/resources/reference.conf @@ -2,7 +2,7 @@ # Akka ZooKepper Mailboxes Reference Config File # ################################################## -# This the reference config file has all the default settings. +# This is the reference config file that contains all the default settings. # Make your edits/overrides in your application.conf. akka { diff --git a/akka-remote/src/main/resources/reference.conf b/akka-remote/src/main/resources/reference.conf index 8ec036db0e..3d7a6050d0 100644 --- a/akka-remote/src/main/resources/reference.conf +++ b/akka-remote/src/main/resources/reference.conf @@ -2,7 +2,7 @@ # Akka Remote Reference Config File # ##################################### -# This the reference config file has all the default settings. +# This is the reference config file that contains all the default settings. # Make your edits/overrides in your application.conf. # comments above akka.actor settings left out where they are already in akka- diff --git a/akka-testkit/src/main/resources/reference.conf b/akka-testkit/src/main/resources/reference.conf index 5e70df9403..17da88c22e 100644 --- a/akka-testkit/src/main/resources/reference.conf +++ b/akka-testkit/src/main/resources/reference.conf @@ -2,7 +2,7 @@ # Akka Testkit Reference Config File # ###################################### -# This the reference config file has all the default settings. +# This is the reference config file that contains all the default settings. # Make your edits/overrides in your application.conf. akka { diff --git a/akka-transactor/src/main/resources/reference.conf b/akka-transactor/src/main/resources/reference.conf index d91a50db33..d1216bd73e 100644 --- a/akka-transactor/src/main/resources/reference.conf +++ b/akka-transactor/src/main/resources/reference.conf @@ -2,7 +2,7 @@ # Akka Transactor Reference Config File # ######################################### -# This the reference config file has all the default settings. +# This is the reference config file that contains all the default settings. # Make your edits/overrides in your application.conf. akka { diff --git a/akka-zeromq/src/main/resources/reference.conf b/akka-zeromq/src/main/resources/reference.conf index b94a442c78..ed52dc84e1 100644 --- a/akka-zeromq/src/main/resources/reference.conf +++ b/akka-zeromq/src/main/resources/reference.conf @@ -2,7 +2,7 @@ # Akka ZeroMQ Reference Config File # ##################################### -# This the reference config file has all the default settings. +# This is the reference config file that contains all the default settings. # Make your edits/overrides in your application.conf. akka { From 38d4d96ca35435a3701dfa50d8babfd3f31fe29e Mon Sep 17 00:00:00 2001 From: Adam Lesperance Date: Tue, 21 Feb 2012 14:51:43 -0600 Subject: [PATCH 2/2] Fix akka-remote default config's spelling/grammer/formatting --- akka-remote/src/main/resources/reference.conf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/akka-remote/src/main/resources/reference.conf b/akka-remote/src/main/resources/reference.conf index 3d7a6050d0..1438904fe2 100644 --- a/akka-remote/src/main/resources/reference.conf +++ b/akka-remote/src/main/resources/reference.conf @@ -5,7 +5,7 @@ # This is the reference config file that contains all the default settings. # Make your edits/overrides in your application.conf. -# comments above akka.actor settings left out where they are already in akka- +# comments about akka.actor settings left out where they are already in akka- # actor.jar, because otherwise they would be repeated in config rendering. akka { @@ -60,7 +60,7 @@ akka { # untrusted clients to connect. untrusted-mode = off - # Timeout for ACK of cluster operations, lik checking actor out etc. + # Timeout for ACK of cluster operations, like checking actor out etc. remote-daemon-ack-timeout = 30s # If this is "on", Akka will log all inbound messages at DEBUG level, if off then they are not logged @@ -76,16 +76,16 @@ akka { # to client). netty { - # (O) In case of increased latency / overflow how long - # should we wait (blocking the sender) until we deem the send to be cancelled? + # (O) In case of increased latency / overflow how long should we wait (blocking the sender) + # until we deem the send to be cancelled? # 0 means "never backoff", any positive number will indicate time to block at most. backoff-timeout = 0ms # (I&O) Generate your own with '$AKKA_HOME/scripts/generate_config_with_secure_cookie.sh' - # or using 'akka.util.Crypt.generateSecureCookie' + # or using 'akka.util.Crypt.generateSecureCookie' secure-cookie = "" - # (I) Should the remote server require that it peers share the same secure-cookie + # (I) Should the remote server require that its peers share the same secure-cookie # (defined in the 'remote' section)? require-cookie = off