summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorFrancesco Mazzoli <francesco@rabbitmq.com>2012-07-05 18:28:00 +0100
committerFrancesco Mazzoli <francesco@rabbitmq.com>2012-07-05 18:28:00 +0100
commit54b0b4bc26cb63e8b6d90eb3ce9f1b41180dff9b (patch)
tree566e29f58345cf74af0a3a264a9fc7e45b3ce67f /docs
parent48c7fa88e07b145464c69105242a2d03b94be788 (diff)
parent63477af925d226c937aee6984c6380699ede0a11 (diff)
downloadrabbitmq-server-git-54b0b4bc26cb63e8b6d90eb3ce9f1b41180dff9b.tar.gz
merge default
Diffstat (limited to 'docs')
-rw-r--r--docs/rabbitmqctl.1.xml10
1 files changed, 9 insertions, 1 deletions
diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml
index d6f6d51fab..2d25edee40 100644
--- a/docs/rabbitmqctl.1.xml
+++ b/docs/rabbitmqctl.1.xml
@@ -887,6 +887,10 @@
<listitem><para>Queue arguments.</para></listitem>
</varlistentry>
<varlistentry>
+ <term>policy</term>
+ <listitem><para>Policy name applying to the queue.</para></listitem>
+ </varlistentry>
+ <varlistentry>
<term>pid</term>
<listitem><para>Id of the Erlang process associated with the queue.</para></listitem>
</varlistentry>
@@ -999,6 +1003,10 @@
<term>arguments</term>
<listitem><para>Exchange arguments.</para></listitem>
</varlistentry>
+ <varlistentry>
+ <term>policy</term>
+ <listitem><para>Policy name for applying to the exchange.</para></listitem>
+ </varlistentry>
</variablelist>
<para>
If no <command>exchangeinfoitem</command>s are specified then
@@ -1207,7 +1215,7 @@
</varlistentry>
<varlistentry>
<term>timeout</term>
- <listitem><para>Connection timeout.</para></listitem>
+ <listitem><para>Connection timeout / negotiated heartbeat interval, in seconds.</para></listitem>
</varlistentry>
<varlistentry>
<term>frame_max</term>