merge v1_5 into default

4 files changed, 23 insertions, 21 deletions

diff --git a/docs/rabbitmq-multi.1.pod b/docs/rabbitmq-multi.1.pod
index 82c3911681..23fd96ed65 100644
--- a/docs/rabbitmq-multi.1.pod
+++ b/docs/rabbitmq-multi.1.pod
@@ -40,7 +40,7 @@ Start 3 local RabbitMQ nodes with unique, sequential port numbers:
 
 =head1 SEE ALSO
 
-rabbitmq-server(1), rabbitmqctl(1)
+rabbitmq.conf(5), rabbitmq-server(1), rabbitmqctl(1)
 
 =head1 AUTHOR
 
diff --git a/docs/rabbitmq-server.1.pod b/docs/rabbitmq-server.1.pod
index 00210c8b5c..99a7ceccf3 100644
--- a/docs/rabbitmq-server.1.pod
+++ b/docs/rabbitmq-server.1.pod
@@ -44,7 +44,7 @@ B<RABBITMQ_NODE_PORT>
     Defaults to 5672. 
 
 B<RABBITMQ_CLUSTER_CONFIG_FILE>
-    Defaults to /etc/default/rabbitmq_cluster.config. If this file is
+    Defaults to /etc/rabbitmq/rabbitmq_cluster.config. If this file is
     present it is used by the server to auto-configure a RabbitMQ
     cluster.
     See the clustering guide at http://www.rabbitmq.com/clustering.html
@@ -62,7 +62,7 @@ Run RabbitMQ AMQP server in the background:
 
 =head1 SEE ALSO
 
-rabbitmq-multi(1), rabbitmqctl(1)
+rabbitmq.conf(5), rabbitmq-multi(1), rabbitmqctl(1)
 
 =head1 AUTHOR
 
diff --git a/docs/rabbitmq.5.pod b/docs/rabbitmq.conf.5.pod
index e6972935f5..9b2536c383 100644
--- a/docs/rabbitmq.5.pod
+++ b/docs/rabbitmq.conf.5.pod
@@ -1,10 +1,10 @@
 =head1 NAME
 
-/etc/default/rabbitmq - default settings for RabbitMQ AMQP server
+/etc/rabbitmq/rabbitmq.conf - default settings for RabbitMQ AMQP server
 
 =head1 DESCRIPTION
 
-/etc/default/rabbitmq contains variable settings that override the
+/etc/rabbitmq/rabbitmq.conf contains variable settings that override the
 defaults built in to the RabbitMQ startup scripts.
 
 The file is interpreted by the system shell, and so should consist of
@@ -13,29 +13,29 @@ syntax is permitted (since the file is sourced using the shell "."
 operator), including line comments starting with "#".
 
 In order of preference, the startup scripts get their values from the
-environment, from /etc/default/rabbitmq, and finally from the built-in
-default values. For example, for the B<RABBITMQ_NODENAME> setting,
+environment, from /etc/rabbitmq/rabbitmq.conf and finally from the
+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 
+    from the environment is checked first. If it is absent or equal to
+    the empty string, then 
 
 B<NODENAME>
-    from /etc/default/rabbitmq is checked next. If it is also absent
-    or set equal to the empty string, then the default value from the
-    startup script is used.
+    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.
 
-The variable names in /etc/default/rabbitmq are always equal to the
+The variable names in /etc/rabbitmq/rabbitmq.conf are always equal to the
 environment variable names, with the B<RABBITMQ_> prefix removed:
 B<RABBITMQ_NODE_PORT> from the environment becomes B<NODE_PORT> in the
-/etc/default/rabbitmq file, etc.
+/etc/rabbitmq/rabbitmq.conf file, etc.
 
 =head1 EXAMPLES
 
-The following is an example of a complete /etc/default/rabbitmq file
+The following is an example of a complete /etc/rabbitmq/rabbitmq.conf file
 that overrides the default Erlang node name from "rabbit" to "hare":
 
-    # I am a complete /etc/default/rabbitmq file.
+    # I am a complete /etc/rabbitmq/rabbitmq.conf file.
     # Comment lines start with a hash character.
     # This is a /bin/sh script file - use ordinary envt var syntax
     NODENAME=hare
@@ -46,7 +46,7 @@ rabbitmq-server(1), rabbitmq-multi(1), rabbitmqctl(1)
 
 =head1 AUTHOR
 
-Originally written by The RabbitMQ Team <info@lshift.net>
+Originally written by The RabbitMQ Team <info@rabbitmq.com>
 
 =head1 COPYRIGHT
 
diff --git a/docs/rabbitmqctl.1.pod b/docs/rabbitmqctl.1.pod
index d86aa2717d..a0232a40f2 100644
--- a/docs/rabbitmqctl.1.pod
+++ b/docs/rabbitmqctl.1.pod
@@ -109,8 +109,9 @@ add_vhost I<vhostpath>
 
 delete_vhost I<vhostpath>
     delete a virtual host I<vhostpath>.
-    That command deletes also all its exchanges, queues and user mappings.
-
+    That command deletes also all its exchanges, queues and user
+    mappings.
+    
 list_vhosts
     list all virtual hosts.
 
@@ -162,7 +163,8 @@ messages_ready
     number of messages ready to be delivered to clients
 
 messages_unacknowledged
-    number of messages delivered to clients but not yet acknowledged
+    number of messages delivered to clients but not yet
+    acknowledged
 
 messages_uncommitted
     number of messages published in as yet uncommitted transactions
@@ -299,7 +301,7 @@ them:
 
 =head1 SEE ALSO
 
-rabbitmq-multi(1), rabbitmq-server(1)
+rabbitmq.conf(5), rabbitmq-multi(1), rabbitmq-server(1)
 
 =head1 AUTHOR