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

diff --git a/redis.conf b/redis.conf
index df23414c20af883c77a0b4ff9b0e7068564d72ba..592171204fdb127ccb83969dee653d1456026e11 100644 (file)
--- a/redis.conf
+++ b/redis.conf
@@ -126,7 +126,7 @@ dir ./
 # is still in progress, the slave can act in two different ways:
 #
 # 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will
-#    still reply to client requests, possibly with out of data data, or the
+#    still reply to client requests, possibly with out of date data, or the
 #    data set may just be empty if this is the first synchronization.
 #
 # 2) if slave-serve-stale data is set to 'no' the slave will reply with