diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2012-01-24 18:27:38 +0000 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2012-01-24 18:27:38 +0000 |
| commit | 60a09e95e6a3bb0f3383097e108a10d5269f0e2d (patch) | |
| tree | cff4001e2d7dcded69dd810989a035c579ff2b62 /docs | |
| parent | 2142d1b62ef070cb413222920dac858ad53c33df (diff) | |
| parent | c177658c5547d4648f47b6dbb92e5e86dd84cb2b (diff) | |
| download | rabbitmq-server-git-60a09e95e6a3bb0f3383097e108a10d5269f0e2d.tar.gz | |
merge default into bug20337
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/rabbitmq-service.xml | 3 | ||||
| -rw-r--r-- | docs/rabbitmqctl.1.xml | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/docs/rabbitmq-service.xml b/docs/rabbitmq-service.xml index 3368960b80..a4bd158087 100644 --- a/docs/rabbitmq-service.xml +++ b/docs/rabbitmq-service.xml @@ -66,7 +66,8 @@ Display usage information. <para> Install the service. The service will not be started. Subsequent invocations will update the service parameters if -relevant environment variables were modified. +relevant environment variables were modified or if the active +plugins were changed. </para> </listitem> </varlistentry> 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> |