summaryrefslogtreecommitdiff
path: root/docs/rabbitmq.conf.5.pod
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@lshift.net>2009-08-24 18:06:58 +0100
committerMatthew Sackman <matthew@lshift.net>2009-08-24 18:06:58 +0100
commitcdb228fbb76aa640b3043ba53d460ca3a9717de9 (patch)
tree38f46f02f64ea91ca98a4a09043c53083cc714b8 /docs/rabbitmq.conf.5.pod
parent183ba68a125927970814f70c275d4e49c59be5d9 (diff)
parenta43adab41db006818c846af80ed7a72e1180872c (diff)
downloadrabbitmq-server-git-cdb228fbb76aa640b3043ba53d460ca3a9717de9.tar.gz
merge in from default
Diffstat (limited to 'docs/rabbitmq.conf.5.pod')
-rw-r--r--docs/rabbitmq.conf.5.pod6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/rabbitmq.conf.5.pod b/docs/rabbitmq.conf.5.pod
index 9b2536c383..4d522163bc 100644
--- a/docs/rabbitmq.conf.5.pod
+++ b/docs/rabbitmq.conf.5.pod
@@ -18,12 +18,12 @@ built-in default values. For example, for the B<RABBITMQ_NODENAME> setting,
B<RABBITMQ_NODENAME>
from the environment is checked first. If it is absent or equal to
- the empty string, then
+the empty string, then
B<NODENAME>
from /etc/rabbitmq/rabbitmq.conf is checked. If it is also absent
- or set equal to the empty string then the default value from
- the startup script is used.
+or set equal to the empty string then the default value from the
+startup script is used.
The variable names in /etc/rabbitmq/rabbitmq.conf are always equal to the
environment variable names, with the B<RABBITMQ_> prefix removed: