summaryrefslogtreecommitdiff
path: root/redis.conf
diff options
context:
space:
mode:
authorSalvatore Sanfilippo <antirez@gmail.com>2019-10-28 09:57:19 +0100
committerGitHub <noreply@github.com>2019-10-28 09:57:19 +0100
commitc6c65d9ab3186c2da1744186158b38412baa1244 (patch)
tree4ba3e8a725bddae3438cc14dedfe53700ab18d35 /redis.conf
parentd07022170720fa4f66858e8df704cf8803c611f0 (diff)
parentcb2ca37f88d811f3af4c2f91c630e4554d90c87e (diff)
downloadredis-c6c65d9ab3186c2da1744186158b38412baa1244.tar.gz
Merge pull request #6503 from cstrotm/unstable
Typo fix: kill -> still
Diffstat (limited to 'redis.conf')
-rw-r--r--redis.conf7
1 files changed, 3 insertions, 4 deletions
diff --git a/redis.conf b/redis.conf
index 408426f15..0ec3321a5 100644
--- a/redis.conf
+++ b/redis.conf
@@ -134,7 +134,7 @@ tcp-keepalive 300
# By default, TLS/SSL is disabled. To enable it, the "tls-port" configuration
# directive can be used to define TLS-listening ports. To enable TLS on the
# default port, use:
-#
+#
# port 0
# tls-port 6379
@@ -1309,7 +1309,7 @@ notify-keyspace-events ""
# Redis contains an implementation of the Gopher protocol, as specified in
# the RFC 1436 (https://www.ietf.org/rfc/rfc1436.txt).
#
-# The Gopher protocol was very popular in the late '90s. It is an alternative
+# The Gopher protocol was very popular in the late '90s. It is an alternative
# to the web, and the implementation both server and client side is so simple
# that the Redis server has just 100 lines of code in order to implement this
# support.
@@ -1347,7 +1347,7 @@ notify-keyspace-events ""
# to server Gopher pages MAKE SURE TO SET A PASSWORD to the instance.
# Once a password is set:
#
-# 1. The Gopher server (when enabled, not by default) will kill serve
+# 1. The Gopher server (when enabled, not by default) will still serve
# content via Gopher.
# 2. However other commands cannot be called before the client will
# authenticate.
@@ -1669,4 +1669,3 @@ rdb-save-incremental-fsync yes
# Maximum number of set/hash/zset/list fields that will be processed from
# the main dictionary scan
# active-defrag-max-scan-fields 1000
-