summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAlexandru Scvortov <alexandru@rabbitmq.com>2012-01-17 01:16:12 +0000
committerAlexandru Scvortov <alexandru@rabbitmq.com>2012-01-17 01:16:12 +0000
commitaee2983d79bde3725ebdaf5e71e9f1dee4115d52 (patch)
tree7552d12081d8a50492b1674690091ec675a7e328 /docs
parent1b6d50a604cd527475f905cc696bbc9adb7d4d41 (diff)
parent53d21a228bff099407b32c4dd211797e33c885d5 (diff)
downloadrabbitmq-server-git-aee2983d79bde3725ebdaf5e71e9f1dee4115d52.tar.gz
merge bug 24265 into default (Somehow support DNs in rabbitmq_auth_mechanism_ssl)
Diffstat (limited to 'docs')
-rw-r--r--docs/rabbitmqctl.1.xml7
1 files changed, 4 insertions, 3 deletions
diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml
index 157550387d..7268f09037 100644
--- a/docs/rabbitmqctl.1.xml
+++ b/docs/rabbitmqctl.1.xml
@@ -1273,9 +1273,10 @@
<para>
Displays broker status information such as the running
applications on the current Erlang node, RabbitMQ and
- Erlang versions, OS name and memory statistics. (See
- the <command>cluster_status</command> command to find
- out which nodes are clustered and running.)
+ Erlang versions, OS name, memory and file descriptor
+ statistics. (See the <command>cluster_status</command>
+ command to find out which nodes are clustered and
+ running.)
</para>
<para role="example-prefix">For example:</para>
<screen role="example">rabbitmqctl status</screen>