merging in from default

Author: Matthew Sackman

docs/rabbitmq-activate-plugins.1.pod

@@ -1,6 +1,7 @@
 =head1 NAME
 
-rabbitmq-activate-plugins - command line tool for activating plugins in a RabbitMQ broker
+rabbitmq-activate-plugins - command line tool for activating plugins
+in a RabbitMQ broker
 
 =head1 SYNOPSIS
 
@@ -12,8 +13,8 @@ RabbitMQ is an implementation of AMQP, the emerging standard for high
 performance enterprise messaging. The RabbitMQ server is a robust and
 scalable implementation of an AMQP broker.
 
-rabbitmq-activate-plugins is a command line tool for activating plugins installed
-into the broker's plugins directory.
+rabbitmq-activate-plugins is a command line tool for activating
+plugins installed into the broker's plugins directory.
 
 =head1 EXAMPLES
 
@@ -24,12 +25,13 @@ execute:
 
 =head1 SEE ALSO
 
-rabbitmq.conf(5), rabbitmq-multi(1), rabbitmq-server(1), rabbitmqctl(1)
+L<rabbitmq.conf(5)>, L<rabbitmq-multi(1)>, L<rabbitmq-server(1)>,
+L<rabbitmqctl(1)>
 
 =head1 AUTHOR
 
 The RabbitMQ Team <[email protected]>
 
 =head1 REFERENCES
 
-RabbitMQ Web Site: http://www.rabbitmq.com
+RabbitMQ Web Site: L<http://www.rabbitmq.com>

docs/rabbitmq-multi.1.pod

@@ -15,22 +15,30 @@ scalable implementation of an AMQP broker.
 rabbitmq-multi scripts allows for easy set-up of a cluster on a single
 machine.
 
-See also rabbitmq-server(1) for configuration information.
+See also L<rabbitmq-server(1)> for configuration information.
 
 =head1 COMMANDS
 
-start_all I<count>
-    start count nodes with unique names, listening on all IP addresses
-and on sequential ports starting from 5672.
+=over
 
-status
-    print the status of all running RabbitMQ nodes
+=item start_all I<count>
 
-stop_all
-    stop all local RabbitMQ nodes
+Start count nodes with unique names, listening on all IP addresses and
+on sequential ports starting from 5672.
 
-rotate_logs
-    rotate log files for all local and running RabbitMQ nodes
+=item status
+
+Print the status of all running RabbitMQ nodes.
+
+=item stop_all
+
+Stop all local RabbitMQ nodes,
+
+=item rotate_logs
+
+Rotate log files for all local and running RabbitMQ nodes.
+
+=back
 
 =head1 EXAMPLES
 
@@ -40,12 +48,12 @@ Start 3 local RabbitMQ nodes with unique, sequential port numbers:
 
 =head1 SEE ALSO
 
-rabbitmq.conf(5), rabbitmq-server(1), rabbitmqctl(1)
+L<rabbitmq.conf(5)>, L<rabbitmq-server(1)>, L<rabbitmqctl(1)>
 
 =head1 AUTHOR
 
 The RabbitMQ Team <[email protected]>
 
 =head1 REFERENCES
 
-RabbitMQ Web Site: http://www.rabbitmq.com
+RabbitMQ Web Site: L<http://www.rabbitmq.com>

docs/rabbitmq-server.1.pod

@@ -16,41 +16,57 @@ Running rabbitmq-server in the foreground displays a banner message,
 and reports on progress in the startup sequence, concluding with the
 message "broker running", indicating that the RabbitMQ broker has been
 started successfully. To shut down the server, just terminate the
-process or use rabbitmqctl(1). 
+process or use L<rabbitmqctl(1)>.
 
 =head1 ENVIRONMENT
 
-B<RABBITMQ_MNESIA_BASE>
-    Defaults to /var/lib/rabbitmq/mnesia. Set this to the directory
-where Mnesia database files should be placed.
+=over
 
-B<RABBITMQ_LOG_BASE>
-    Defaults to /var/log/rabbitmq. Log files generated by the server
-will be placed in this directory.
+=item B<RABBITMQ_MNESIA_BASE>
 
-B<RABBITMQ_NODENAME>
-    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
+Defaults to F</var/lib/rabbitmq/mnesia>. Set this to the directory where
+Mnesia database files should be placed.
+
+=item B<RABBITMQ_LOG_BASE>
+
+Defaults to F</var/log/rabbitmq>. Log files generated by the server will
+be placed in this directory.
+
+=item B<RABBITMQ_NODENAME>
+
+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
-http://www.rabbitmq.com/clustering.html#single-machine for details.
+L<http://www.rabbitmq.com/clustering.html#single-machine> for details.
+
+=item B<RABBITMQ_NODE_IP_ADDRESS>
+
+Defaults to 0.0.0.0. This can be changed if you only want to bind to
+one network interface.
 
-B<RABBITMQ_NODE_IP_ADDRESS>
-    Defaults to 0.0.0.0. This can be changed if you only want to bind
-to one network interface.
+=item B<RABBITMQ_NODE_PORT>
 
-B<RABBITMQ_NODE_PORT>
-    Defaults to 5672. 
+Defaults to 5672. 
 
-B<RABBITMQ_CLUSTER_CONFIG_FILE>
-    Defaults to /etc/rabbitmq/rabbitmq_cluster.config. If this file is
+=item B<RABBITMQ_CLUSTER_CONFIG_FILE>
+
+Defaults to F</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
+See the clustering guide at L<http://www.rabbitmq.com/clustering.html>
 for details.
 
+=back
+
 =head1 OPTIONS
 
-B<-detached> start the server process in the background
+=over
+
+=item B<-detached>
+
+start the server process in the background
+
+=back
 
 =head1 EXAMPLES
 
@@ -60,12 +76,13 @@ Run RabbitMQ AMQP server in the background:
 
 =head1 SEE ALSO
 
-rabbitmq.conf(5), rabbitmq-multi(1), rabbitmqctl(1)
+L<rabbitmq.conf(5)>, L<rabbitmq-multi(1)>, L<rabbitmqctl(1)>
 
 =head1 AUTHOR
 
 The RabbitMQ Team <[email protected]>
 
 =head1 REFERENCES
 
-RabbitMQ Web Site: http://www.rabbitmq.com
+RabbitMQ Web Site: L<http://www.rabbitmq.com>
+

docs/rabbitmq.conf.5.pod

@@ -1,10 +1,11 @@
 =head1 NAME
 
-/etc/rabbitmq/rabbitmq.conf - default settings for RabbitMQ AMQP server
+F</etc/rabbitmq/rabbitmq.conf> - default settings for RabbitMQ AMQP
+server
 
 =head1 DESCRIPTION
 
-/etc/rabbitmq/rabbitmq.conf contains variable settings that override the
+F</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,27 +14,35 @@ 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/rabbitmq/rabbitmq.conf and finally from the
-built-in default values. For example, for the B<RABBITMQ_NODENAME> setting,
+environment, from F</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
+=over
 
-B<NODENAME>
-    from /etc/rabbitmq/rabbitmq.conf is checked. If it is also absent
+=item B<RABBITMQ_NODENAME>
+
+from the environment is checked first. If it is absent or equal to the
+empty string, then
+
+=item B<NODENAME>
+
+from L</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/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/rabbitmq/rabbitmq.conf file, etc.
+F</etc/rabbitmq/rabbitmq.conf> file, etc.
+
+=back
 
 =head1 EXAMPLES
 
-The following is an example of a complete /etc/rabbitmq/rabbitmq.conf file
-that overrides the default Erlang node name from "rabbit" to "hare":
+The following is an example of a complete
+F</etc/rabbitmq/rabbitmq.conf> file that overrides the default Erlang
+node name from "rabbit" to "hare":
 
     # I am a complete /etc/rabbitmq/rabbitmq.conf file.
     # Comment lines start with a hash character.
@@ -42,7 +51,7 @@ that overrides the default Erlang node name from "rabbit" to "hare":
 
 =head1 SEE ALSO
 
-rabbitmq-server(1), rabbitmq-multi(1), rabbitmqctl(1)
+L<rabbitmq-server(1)>, L<rabbitmq-multi(1)>, L<rabbitmqctl(1)>
 
 =head1 AUTHOR
 
@@ -57,4 +66,4 @@ [email protected].
 
 =head1 REFERENCES
 
-RabbitMQ Web Site: http://www.rabbitmq.com
+RabbitMQ Web Site: L<http://www.rabbitmq.com>