Merge branch 'stable' into rabbitmq-server-485

1 files changed, 40 insertions, 9 deletions

diff --git a/docs/rabbitmq.config.example b/docs/rabbitmq.config.example
index a8e5016524..55c5736994 100644
--- a/docs/rabbitmq.config.example
+++ b/docs/rabbitmq.config.example
@@ -120,6 +120,12 @@
    %%
    %% {ssl_handshake_timeout, 5000},
 
+   %% Password hashing implementation. Will only affect newly
+   %% created users. To recalculate hash for an existing user
+   %% it's necessary to update her password.
+   %%
+   %% {password_hashing_module, rabbit_password_hashing_sha256},
+
    %%
    %% Default User / VHost
    %% ====================
@@ -155,6 +161,11 @@
    %%
    %% {frame_max, 131072},
 
+   %% Set the max frame size the server will accept before connection
+   %% tuning occurs
+   %%
+   %% {initial_frame_max, 4096},
+
    %% Set the max permissible number of channels per connection.
    %% 0 means "no limit".
    %%
@@ -165,10 +176,7 @@
    %% See (http://www.erlang.org/doc/man/inet.html#setopts-2) for
    %% further documentation.
    %%
-   %% {tcp_listen_options, [binary,
-   %%                       {packet,        raw},
-   %%                       {reuseaddr,     true},
-   %%                       {backlog,       128},
+   %% {tcp_listen_options, [{backlog,       128},
    %%                       {nodelay,       true},
    %%                       {exit_on_close, false}]},
 
@@ -185,21 +193,47 @@
    %% Alternatively, we can set a limit (in bytes) of RAM used by the node.
    %%
    %% {vm_memory_high_watermark, {absolute, 1073741824}},
+   %%
+   %% Or you can set absolute value using memory units.
+   %%
+   %% {vm_memory_high_watermark, {absolute, "1024M"}},
+   %%
+   %% Supported units suffixes:
+   %%
+   %% k, kiB: kibibytes (2^10 bytes)
+   %% M, MiB: mebibytes (2^20)
+   %% G, GiB: gibibytes (2^30)
+   %% kB: kilobytes (10^3)
+   %% MB: megabytes (10^6)
+   %% GB: gigabytes (10^9)
 
    %% Fraction of the high watermark limit at which queues start to
    %% page message out to disc in order to free up memory.
    %%
+   %% Values greater than 0.9 can be dangerous and should be used carefully.
+   %%
    %% {vm_memory_high_watermark_paging_ratio, 0.5},
 
+   %% Interval (in milliseconds) at which we perform the check of the memory
+   %% levels against the watermarks.
+   %%
+   %% {memory_monitor_interval, 2500},
+
    %% Set disk free limit (in bytes). Once free disk space reaches this
    %% lower bound, a disk alarm will be set - see the documentation
    %% listed above for more details.
    %%
    %% {disk_free_limit, 50000000},
+   %%
+   %% Or you can set it using memory units (same as in vm_memory_high_watermark)
+   %% {disk_free_limit, "50MB"},
+   %% {disk_free_limit, "50000kB"},
+   %% {disk_free_limit, "2GB"},
 
    %% Alternatively, we can set a limit relative to total available RAM.
    %%
-   %% {disk_free_limit, {mem_relative, 1.0}},
+   %% Values lower than 1.0 can be dangerous and should be used carefully.
+   %% {disk_free_limit, {mem_relative, 2.0}},
 
    %%
    %% Misc/Advanced Options
@@ -467,10 +501,7 @@
 
    %% TCP/Socket options (as per the broker configuration).
    %%
-   %% {tcp_listen_options, [binary,
-   %%                       {packet,    raw},
-   %%                       {reuseaddr, true},
-   %%                       {backlog,   128},
+   %% {tcp_listen_options, [{backlog,   128},
    %%                       {nodelay,   true}]}
   ]},