Merge remote-tracking branch 'origin/unstable' into unstable

[redis.git] / redis.conf

diff --git a/redis.conf b/redis.conf
index eba768ce7f526cb3db239931f476b96db6b8f0ae..5a85a4ea21d1af0da4e6b4f39ac083238fffd466 100644 (file)
--- a/redis.conf
+++ b/redis.conf
@@ -459,7 +459,7 @@ activerehashing yes
 #
 # The syntax of every client-output-buffer-limit directive is the following:
 #
-#   client-output-buffer-limit <hard limit> <soft limit> <soft limit seconds>
+# client-output-buffer-limit <class> <hard limit> <soft limit> <soft seconds>
 #
 # A client is immediately disconnected once the hard limit is reached, or if
 # the soft limit is reached and remains reached for the specified number of