summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAlexandru Scvortov <alexandru@rabbitmq.com>2010-10-01 10:01:07 +0100
committerAlexandru Scvortov <alexandru@rabbitmq.com>2010-10-01 10:01:07 +0100
commita31f800b002405c654fe043816cd69057fb9a2ee (patch)
treeac97255f5650d84be0a2767250f01db5c1409911 /docs
parentd93894fed66dbba7822e55051be21e82814b0b38 (diff)
parent5b038b35fbe3695d5020174a16b5bb901c6a294e (diff)
downloadrabbitmq-server-git-a31f800b002405c654fe043816cd69057fb9a2ee.tar.gz
merge default into bug22902
Diffstat (limited to 'docs')
-rw-r--r--docs/html-to-website-xml.xsl2
-rw-r--r--docs/rabbitmqctl.1.xml8
2 files changed, 9 insertions, 1 deletions
diff --git a/docs/html-to-website-xml.xsl b/docs/html-to-website-xml.xsl
index 662dbea00a..c325bb5a08 100644
--- a/docs/html-to-website-xml.xsl
+++ b/docs/html-to-website-xml.xsl
@@ -30,7 +30,7 @@
<code><xsl:value-of select="document($original)/refentry/refnamediv/refname"/>(<xsl:value-of select="document($original)/refentry/refmeta/manvolnum"/>)</code>.
</p>
<p>
- <a href="manpages.html">See a list of all manual pages</a>.
+ <a href="../manpages.html">See a list of all manual pages</a>.
</p>
</xsl:when>
<xsl:otherwise>
diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml
index 609a918f98..73882861fc 100644
--- a/docs/rabbitmqctl.1.xml
+++ b/docs/rabbitmqctl.1.xml
@@ -1116,6 +1116,14 @@
<term>prefetch_count</term>
<listitem><para>QoS prefetch count limit in force, 0 if unlimited.</para></listitem>
</varlistentry>
+ <varlistentry>
+ <term>client_flow_blocked</term>
+ <listitem><para>True if the client issued a
+ <command>channel.flow{active=false}</command>
+ command, blocking the server from delivering
+ messages to the channel's consumers.
+ </para></listitem>
+ </varlistentry>
</variablelist>
<para>
If no <command>channelinfoitem</command>s are specified then pid,