Merge branch 'master' into rabbitmq-server-1229

2 files changed, 3 insertions, 3 deletions

diff --git a/docs/rabbitmq.conf.example b/docs/rabbitmq.conf.example
index 0e8d1e0596..e4c2fff92a 100644
--- a/docs/rabbitmq.conf.example
+++ b/docs/rabbitmq.conf.example
@@ -386,7 +386,7 @@
 ## Disabling background GC may reduce latency for client operations,
 ## keeping it enabled may reduce median RAM usage.
 ##
-# background_gc_enabled = true
+# background_gc_enabled = false
 
 ## Target (desired) interval (in milliseconds) at which we run background GC.
 ## The actual interval will vary depending on how long it takes to execute
diff --git a/docs/rabbitmq.config.example b/docs/rabbitmq.config.example
index 2be3c74095..4135c5053c 100644
--- a/docs/rabbitmq.config.example
+++ b/docs/rabbitmq.config.example
@@ -276,7 +276,7 @@
    %% See http://www.rabbitmq.com/partitions.html for further details.
    %%
    %% {cluster_partition_handling, ignore},
-   
+
    %% Mirror sync batch size, in messages. Increasing this will speed
    %% up syncing but total batch size in bytes must not exceed 2 GiB.
    %% Available in RabbitMQ 3.6.0 or later.
@@ -343,7 +343,7 @@
    %% Disabling background GC may reduce latency for client operations,
    %% keeping it enabled may reduce median RAM usage.
    %%
-   %% {background_gc_enabled, true},
+   %% {background_gc_enabled, false},
    %%
    %% Target (desired) interval (in milliseconds) at which we run background GC.
    %% The actual interval will vary depending on how long it takes to execute