merge bug19914 into default

2 files changed, 16 insertions, 18 deletions

diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index fbee9ef3d7..471ae31fe5 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -110,9 +110,7 @@ fi
 %defattr(-,root,root,-)
 %{_erllibdir}/rabbitmq_server-%{version}/
 %{_rabbitbindir}/
-%{_mandir}/man1/rabbitmq-multi.1.gz
-%{_mandir}/man1/rabbitmq-server.1.gz
-%{_mandir}/man1/rabbitmqctl.1.gz
+%{_mandir}/
 %{_sbindir}/rabbitmqctl
 %dir /var/lib/rabbitmq
 %dir /var/log/rabbitmq
diff --git a/packaging/windows/rabbitmq-service.pod b/packaging/windows/rabbitmq-service.pod
index c762826fa8..7c4d3ef210 100644
--- a/packaging/windows/rabbitmq-service.pod
+++ b/packaging/windows/rabbitmq-service.pod
@@ -63,7 +63,7 @@ type to B<Automatic> using the service control panel.
 
 =head1 ENVIRONMENT
 
-=head2 SERVICENAME
+=head2 RABBITMQ_SERVICENAME
 
 Defaults to RabbitMQ.
 This is the location of log and database directories.
@@ -73,21 +73,20 @@ This is the location of log and database directories.
 Defaults to the application data directory of the current user.
 This is the location of log and database directories.
 
-=head2 NODENAME
+=head2 RABBITMQ_NODENAME
 
-Defaults to "rabbit". This can be useful if you want to run more
-than one node per machine - B<NODENAME> should be unique per
+Defaults to "rabbit". This can be useful if you want to run more than
+one node per machine - B<RABBITMQ_NODENAME> should be unique per
 erlang-node-and-machine combination. See clustering on a single
-machine guide
-at L<http://www.rabbitmq.com/clustering.html#single-machine> for
-details. 
+machine guide at
+L<http://www.rabbitmq.com/clustering.html#single-machine> for details.
 
-=head2 NODE_IP_ADDRESS
+=head2 RABBITMQ_NODE_IP_ADDRESS
 
 Defaults to "0.0.0.0". This can be changed if you only want to bind
 to one network interface. 
 
-=head2 NODE_PORT
+=head2 RABBITMQ_NODE_PORT
 
 Defaults to 5672. 
 
@@ -102,7 +101,7 @@ If this file is present it is used by the server to
 auto-configure a RabbitMQ cluster.  See the clustering guide
 at L<http://www.rabbitmq.com/clustering.html> for details.
 
-=head2 CONSOLE_LOG
+=head2 RABBITMQ_CONSOLE_LOG
 
 Set this varable to B<new> or B<reuse> to have the console 
 output from the server redirected to a file named B<SERVICENAME>.debug
@@ -110,11 +109,12 @@ in the  application data directory of the user that installed the service.
 Under Vista this will be F<C:\Documents and Settings\User\AppData\username\SERVICENAME>.
 Under previous versions of Windows this will be 
 F<C:\Documents and Settings\username\Application Data\SERVICENAME>.
-If B<CONSOLE_LOG> is set to B<new> then a new file will be created 
-each time the service starts. If B<CONSOLE_LOG> is set to B<reuse>
-then the file will be overwritten each time the service starts.
-The default behaviour when B<CONSOLE_LOG> is not set or set to a
-value other than B<new> or B<reuse> is to discard the server output.
+If B<RABBITMQ_CONSOLE_LOG> is set to B<new> then a new file will be
+created each time the service starts. If B<RABBITMQ_CONSOLE_LOG> is
+set to B<reuse> then the file will be overwritten each time the
+service starts.  The default behaviour when B<RABBITMQ_CONSOLE_LOG> is
+not set or set to a value other than B<new> or B<reuse> is to discard
+the server output.
 
 =head1 EXAMPLES