From 2c38dc6831e55f2060ecd34e4fbfa16ef8038667 Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Tue, 12 Feb 2019 18:23:00 +0100
Subject: [PATCH] ACL: Document masteruser option in redis.conf.

---
 redis.conf | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/redis.conf b/redis.conf
index 71214b620..e4de9ac64 100644
--- a/redis.conf
+++ b/redis.conf
@@ -291,6 +291,17 @@ dir ./
 # refuse the replica request.
 #
 # masterauth <master-password>
+#
+# However this is not enough if you are using Redis ACLs (for Redis version
+# 6 or greater), and the default user is not capable of running the PSYNC
+# command and/or other commands needed for replication. In this case it's
+# better to configure a special user to use with replication, and specify the
+# masteruser configuration as such:
+#
+# masteruser <username>
+#
+# When masteruser is specified, the replica will authenticate against its
+# master using the new AUTH form: AUTH <username> <password>.
 
 # When a replica loses its connection with the master, or when the replication
 # is still in progress, the replica can act in two different ways: