From: antirez <antirez@gmail.com>
Date: Tue, 22 Nov 2011 13:27:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/unstable' into unstable
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/1b2962c61fd47730924489b689a39ffda6b88a80?hp=1bcfa0f643d53e700d7398985ef236babf18d9bf

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

diff --git a/redis.conf b/redis.conf
index df23414c..59217120 100644
--- 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