Unverified Commit c6c65d9a authored by Salvatore Sanfilippo's avatar Salvatore Sanfilippo Committed by GitHub
Browse files

Merge pull request #6503 from cstrotm/unstable

Typo fix: kill -> still
parents d0702217 cb2ca37f
...@@ -134,7 +134,7 @@ tcp-keepalive 300 ...@@ -134,7 +134,7 @@ tcp-keepalive 300
# By default, TLS/SSL is disabled. To enable it, the "tls-port" configuration # 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 # directive can be used to define TLS-listening ports. To enable TLS on the
# default port, use: # default port, use:
# #
# port 0 # port 0
# tls-port 6379 # tls-port 6379
...@@ -1309,7 +1309,7 @@ notify-keyspace-events "" ...@@ -1309,7 +1309,7 @@ notify-keyspace-events ""
# Redis contains an implementation of the Gopher protocol, as specified in # Redis contains an implementation of the Gopher protocol, as specified in
# the RFC 1436 (https://www.ietf.org/rfc/rfc1436.txt). # 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 # 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 # that the Redis server has just 100 lines of code in order to implement this
# support. # support.
...@@ -1347,7 +1347,7 @@ notify-keyspace-events "" ...@@ -1347,7 +1347,7 @@ notify-keyspace-events ""
# to server Gopher pages MAKE SURE TO SET A PASSWORD to the instance. # to server Gopher pages MAKE SURE TO SET A PASSWORD to the instance.
# Once a password is set: # 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. # content via Gopher.
# 2. However other commands cannot be called before the client will # 2. However other commands cannot be called before the client will
# authenticate. # authenticate.
...@@ -1669,4 +1669,3 @@ rdb-save-incremental-fsync yes ...@@ -1669,4 +1669,3 @@ rdb-save-incremental-fsync yes
# Maximum number of set/hash/zset/list fields that will be processed from # Maximum number of set/hash/zset/list fields that will be processed from
# the main dictionary scan # the main dictionary scan
# active-defrag-max-scan-fields 1000 # active-defrag-max-scan-fields 1000
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment