summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2012-04-02 15:00:33 +0100
committerSimon MacMullen <simon@rabbitmq.com>2012-04-02 15:00:33 +0100
commit81d6fedfbf64b5141a4e0d9f7f0dff18d89d860c (patch)
tree9318355f2cec2e8cb1d120dc16934861e8301b38 /docs
parentc49f49b27f6309cb768290a753779ce6731c297a (diff)
parent85dd778d974c73d70950c773bf8c944d04af0fc2 (diff)
downloadrabbitmq-server-git-81d6fedfbf64b5141a4e0d9f7f0dff18d89d860c.tar.gz
Merge bug24808.
Diffstat (limited to 'docs')
-rw-r--r--docs/rabbitmqctl.1.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml
index ee07ebfea9..ded3ab4831 100644
--- a/docs/rabbitmqctl.1.xml
+++ b/docs/rabbitmqctl.1.xml
@@ -948,7 +948,7 @@
<term>source_kind</term>
<listitem><para>The kind of the source of messages to
which the binding is attached. Currently always
- queue. With non-ASCII characters escaped as in
+ exchange. With non-ASCII characters escaped as in
C.</para></listitem>
</varlistentry>
<varlistentry>
@@ -1074,8 +1074,8 @@
<varlistentry>
<term>last_blocked_by</term>
<listitem><para>The reason for which this connection
- was last blocked. One of 'mem' - due to a memory
- alarm, 'flow' - due to internal flow control, or
+ was last blocked. One of 'resource' - due to a memory
+ or disk alarm, 'flow' - due to internal flow control, or
'none' if the connection was never
blocked.</para></listitem>
</varlistentry>