diff --git a/redis.conf b/redis.conf
index 5a88c31169191fe70d7f7ecc899536312acb70bb..33e7a62e14b550f2b144287ac403efd0bc5d2f52 100644
--- a/redis.conf
+++ b/redis.conf
@@ -203,8 +203,11 @@ slave-read-only yes
 #
 # repl-ping-slave-period 10
 
-# The following option sets a timeout for both Bulk transfer I/O timeout and
-# master data or ping response timeout. The default value is 60 seconds.
+# The following option sets the replication timeout for:
+#
+# 1) Bulk transfer I/O during SYNC, from the point of view of slave.
+# 2) Master timeout from the point of view of slaves (data, pings).
+# 3) Slave timeout from the point of view of masters (REPLCONF ACK pings).
 #
 # It is important to make sure that this value is greater than the value
 # specified for repl-ping-slave-period otherwise a timeout will be detected