summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSalvatore Sanfilippo <antirez@gmail.com>2017-11-28 18:43:45 +0100
committerGitHub <noreply@github.com>2017-11-28 18:43:45 +0100
commitb998e2035c1de289779aa4ca875c6bdd4148be09 (patch)
treeb5d3714e4f4b1bea138104ca568f65e1c5d7407a
parent923502a70b08a9635e857bd7f09c1601bd59a5c4 (diff)
parent22bcee5178c68255d1ba7da908405161c4ffbdf5 (diff)
downloadredis-b998e2035c1de289779aa4ca875c6bdd4148be09.tar.gz
Merge pull request #4165 from zyegfryed/patch-1
Fix some typos
-rw-r--r--redis.conf6
1 files changed, 3 insertions, 3 deletions
diff --git a/redis.conf b/redis.conf
index 249399e9a..54ba1298e 100644
--- a/redis.conf
+++ b/redis.conf
@@ -606,7 +606,7 @@ slave-priority 100
# deletion of the object. It means that the server stops processing new commands
# in order to reclaim all the memory associated with an object in a synchronous
# way. If the key deleted is associated with a small object, the time needed
-# in order to execute th DEL command is very small and comparable to most other
+# in order to execute the DEL command is very small and comparable to most other
# O(1) or O(log_N) commands in Redis. However if the key is associated with an
# aggregated value containing millions of elements, the server can block for
# a long time (even seconds) in order to complete the operation.
@@ -621,7 +621,7 @@ slave-priority 100
# It's up to the design of the application to understand when it is a good
# idea to use one or the other. However the Redis server sometimes has to
# delete keys or flush the whole database as a side effect of other operations.
-# Specifically Redis deletes objects independently of an user call in the
+# Specifically Redis deletes objects independently of a user call in the
# following scenarios:
#
# 1) On eviction, because of the maxmemory and maxmemory policy configurations,
@@ -914,7 +914,7 @@ lua-time-limit 5000
# Docker and other containers).
#
# In order to make Redis Cluster working in such environments, a static
-# configuration where each node known its public address is needed. The
+# configuration where each node knows its public address is needed. The
# following two options are used for this scope, and are:
#
# * cluster-announce-ip