summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2013-12-05 18:29:19 +0000
committerSimon MacMullen <simon@rabbitmq.com>2013-12-05 18:29:19 +0000
commit43f8b10733a55e81a43ccb2a2ff932db6e732630 (patch)
tree9ba46770090e34ab432d87fef1cc7c3cd928def7 /docs
parent2e2d170fa382c0eea224e4e7c7bbd74f4451dcaa (diff)
parent160092e8eab3b9e7eca59cf9ce30ca9f25fc1d5b (diff)
downloadrabbitmq-server-git-43f8b10733a55e81a43ccb2a2ff932db6e732630.tar.gz
merge in default
Diffstat (limited to 'docs')
-rw-r--r--docs/rabbitmq.config.example5
-rw-r--r--docs/rabbitmqctl.1.xml4
2 files changed, 9 insertions, 0 deletions
diff --git a/docs/rabbitmq.config.example b/docs/rabbitmq.config.example
index 91402649e1..c0d6cc7067 100644
--- a/docs/rabbitmq.config.example
+++ b/docs/rabbitmq.config.example
@@ -138,6 +138,11 @@
%%
%% {frame_max, 131072},
+ %% Set the max permissible number of channels per connection.
+ %% 0 means "no limit".
+ %%
+ %% {channel_max, 128},
+
%% Customising Socket Options.
%%
%% See (http://www.erlang.org/doc/man/inet.html#setopts-2) for
diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml
index 6410235d70..d2a3f7c7a2 100644
--- a/docs/rabbitmqctl.1.xml
+++ b/docs/rabbitmqctl.1.xml
@@ -1430,6 +1430,10 @@
<listitem><para>Maximum frame size (bytes).</para></listitem>
</varlistentry>
<varlistentry>
+ <term>channel_max</term>
+ <listitem><para>Maximum number of channels on this connection.</para></listitem>
+ </varlistentry>
+ <varlistentry>
<term>client_properties</term>
<listitem><para>Informational properties transmitted by the client
during connection establishment.</para></listitem>