Allow timeout=0 config to disable client timeouts

[redis.git] / redis.conf

diff --git a/redis.conf b/redis.conf
index f217352eb3f0b18ac64784e89ec060fce4a4fa73..e8c6cd828ade666975cfe448adbd133676e1d0e0 100644 (file)
--- a/redis.conf
+++ b/redis.conf
@@ -16,7 +16,7 @@ port 6379
 #
 # bind 127.0.0.1
 
-# Close the connection after a client is idle for N seconds
+# Close the connection after a client is idle for N seconds (0 to disable)
 timeout 300
 
 # Save the DB on disk:
@@ -34,6 +34,9 @@ save 900 1
 save 300 10
 save 60 10000
 
+# The filename where to dump the DB
+dbfilename dump.rdb
+
 # For default save/load DB in/from the working directory
 # Note that you must specify a directory not a file name.
 dir ./
@@ -50,7 +53,9 @@ loglevel debug
 # output for logging but daemonize, logs will be sent to /dev/null
 logfile stdout
 
-# Set the number of databases.
+# Set the number of databases. The default database is DB 0, you can select
+# a different one on a per-connection basis using SELECT <dbid> where
+# dbid is a number between 0 and 'databases'-1
 databases 16
 
 ################################# REPLICATION #################################
@@ -71,7 +76,7 @@ databases 16
 # This should stay commented out for backward compatibility and because most
 # people do not need auth (e.g. they run their own servers).
 
-#requirepass foobared
+# requirepass foobared
 
 ############################### ADVANCED CONFIG ###############################