ITS#5873

diff --git a/CHANGES b/CHANGES
index ebc1f4d9d43567f33b4a224eaa1cebf78b73e608..70bb69715cb0aff22d9f6bf54808c30b09b9a3a0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -64,6 +64,7 @@ OpenLDAP 2.4.14 Engineering
                slapd-bdb/hdb expansion on dncachesize behavior (ITS#5721)
                slapo-constraint(5) example fix (ITS#5895)
                slap*(8) man pages should mention slapd-config (ITS#5828)
+               slapd(8) document sid (ITS#5873)
                slapadd/cat/index(8) note -n 0 for slapd-config (ITS#5891)
                Added SEE ALSO slapd-config(5) to relevant man pages (ITS#5914)
 

diff --git a/doc/man/man8/slapd.8 b/doc/man/man8/slapd.8
index 04b2573999db60af6b046bb7eb05427d89d97923..1e2c555a0ca458a1631ce14ad548e15a21df0c7f 100644 (file)
--- a/doc/man/man8/slapd.8
+++ b/doc/man/man8/slapd.8
@@ -215,22 +215,34 @@ slapd will use the group database in the change root environment.
 .TP
 .BI \-c " cookie"
 This option provides a cookie for the syncrepl replication consumer.
-The cookie is a comma separated list of name=value pairs.
+The cookie is a comma separated list of \fIname=value\fP pairs.
 Currently supported syncrepl cookie fields are
-.B rid
+.BR rid ,
+.BR sid ,
 and
-.B csn.
+.BR csn .
 .B rid
 identifies a replication thread within the consumer server
 and is used to find the syncrepl specification in 
 .BR slapd.conf (5)
+or
+.BR slapd-config (5)
 having the matching replication identifier in its definition. The
 .B rid
 must be provided in order for any other specified values to be used.
+.B sid
+is the server id in a multi-master/mirror-mode configuration.
 .B csn
 is the commit sequence number received by a previous synchronization
 and represents the state of the consumer replica content which the
 syncrepl engine will synchronize to the current provider content.
+In case of \fImirror-mode\fP or \fImulti-master\fP replication agreement,
+multiple
+.B csn
+values, semicolon separated, can appear.
+Use only the 
+.B rid
+part to force a full reload.
 .TP
 .BI \-o " option[=value]"
 This option provides a generic means to specify options without the need to reserve