summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2011-06-03 11:54:05 +0100
committerEmile Joubert <emile@rabbitmq.com>2011-06-03 11:54:05 +0100
commit7c807cc57fa85721b53a7fae732df86b2618d868 (patch)
treec1ae56f284ae6300754afc0a35ceaf2700d28200
parentcb4208eb277534584d3f955f73f90d4198044e00 (diff)
parent5f152e2e3c555ba96531985ca35cdb64cda362f4 (diff)
downloadrabbitmq-server-7c807cc57fa85721b53a7fae732df86b2618d868.tar.gz
Merge heads
-rw-r--r--docs/rabbitmqctl.1.xml64
1 files changed, 32 insertions, 32 deletions
diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml
index b2dacbcf..c2434770 100644
--- a/docs/rabbitmqctl.1.xml
+++ b/docs/rabbitmqctl.1.xml
@@ -202,6 +202,34 @@
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><cmdsynopsis><command>environment</command></cmdsynopsis></term>
+ <listitem>
+ <para>
+ Display the name and value of each variable in the application environment.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><cmdsynopsis><command>report</command></cmdsynopsis></term>
+ <listitem>
+ <para>
+ Generate a server status report containing a concatenation of all server status
+ information for support purposes. The output should be redirected to a
+ file when accompanying a support request.
+ </para>
+ <para role="example-prefix">
+ For example:
+ </para>
+ <screen role="example">rabbitmqctl report > server_report.txt</screen>
+ <para role="example">
+ This command creates a server report which may be attached to a
+ support request email.
+ </para>
+ </listitem>
+ </varlistentry>
+
<varlistentry id="reset">
<term><cmdsynopsis><command>reset</command></cmdsynopsis></term>
<listitem>
@@ -1290,38 +1318,10 @@
indicating whether acknowledgements are expected for
messages delivered to this consumer.
</para>
- <para role="usage">
- The output format for "list_consumers" is a list of rows containing,
- in order, the queue name, channel process id, consumer tag, and a
- boolean indicating whether acknowledgements are expected from the
- consumer.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><cmdsynopsis><command>environment</command></cmdsynopsis></term>
- <listitem>
- <para role="usage">
- The "environment" command displays variables in the rabbit application
- environment.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><cmdsynopsis><command>report</command></cmdsynopsis></term>
- <listitem>
- <para role="usage">
- The "report" command produces a server status report which is a concatenation
- of all server status information. The output should be redirected to a file
- when accompanying a support request.
- </para>
- <para role="example-prefix">
- For example:
- </para>
- <screen role="example">rabbitmqctl report > server_report.txt</screen>
- <para role="example">
- This command creates a server report which may be attached to a
- support request email.
+ <para>
+ The output is a list of rows containing, in order, the queue name,
+ channel process id, consumer tag, and a boolean indicating whether
+ acknowledgements are expected from the consumer.
</para>
</listitem>
</varlistentry>