Merge bug26088

1 files changed, 10 insertions, 9 deletions

diff --git a/docs/rabbitmq.config.example b/docs/rabbitmq.config.example
index 12c34552b2..b0e13b1b8d 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
@@ -218,15 +223,7 @@
  %% See http://www.rabbitmq.com/clustering.html for details
  %% ----------------------------------------------------------------------------
  {kernel,
-  [%% Provide an explicit port-range for inter-node communications.
-   %% See http://www.rabbitmq.com/clustering.html#firewall for further details.
-
-   %% Sets the minimum / maximum port numbers
-   %%
-   %% {inet_dist_listen_min, 10000},
-   %% {inet_dist_listen_max, 10005},
-
-   %% Sets the net_kernel tick time.
+  [%% Sets the net_kernel tick time.
    %% Please see http://erlang.org/doc/man/kernel_app.html and
    %% http://www.rabbitmq.com/nettick.html for further details.
    %%
@@ -489,6 +486,10 @@
    %%
    %% {port, 389},
 
+   %% LDAP connection timeout, in milliseconds or 'infinity'
+   %%
+   %% {timeout, infinity},
+
    %% Enable logging of LDAP queries.
    %% One of
    %%   - false (no logging is performed)