ITS#8635 - Note that non-zero serverID's are required for MMR, and that serverID...

diff --git a/doc/man/man5/slapd-config.5 b/doc/man/man5/slapd-config.5
index 068111ff712ea1fc84727f9439288d25802bdfa5..7f078ac3fe1c70354da14670460469ce33e013cb 100644 (file)
--- a/doc/man/man5/slapd-config.5
+++ b/doc/man/man5/slapd-config.5
@@ -757,15 +757,16 @@ size allowed.  0 disables security layers.  The default is 65536.
 Specify an integer ID from 0 to 4095 for this server (limited
 to 3 hexadecimal digits).  The ID may also be specified as a
 hexadecimal ID by prefixing the value with "0x".
-These IDs are
+Non-zero IDs are
 required when using multimaster replication and each master must have a
-unique ID. Note that this requirement also applies to separate masters
+unique non-zero ID. Note that this requirement also applies to separate masters
 contributing to a glued set of databases.
 If the URL is provided, this directive may be specified
 multiple times, providing a complete list of participating servers
 and their IDs. The fully qualified hostname of each server should be
 used in the supplied URLs. The IDs are used in the "replica id" field
-of all CSNs generated by the specified server. The default value is zero.
+of all CSNs generated by the specified server. The default value is zero, which
+is only valid for single master replication.
 Example:
 .LP
 .nf

diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
index 6207a1b269b6c485715797a8b1b07e7a41bbdd16..74929ffcbdcc3c88f404810767916adf5d2ad608 100644 (file)
--- a/doc/man/man5/slapd.conf.5
+++ b/doc/man/man5/slapd.conf.5
@@ -947,15 +947,16 @@ e.g. ldapi:// (and eventually IPSEC).  It is not normally used.
 Specify an integer ID from 0 to 4095 for this server (limited
 to 3 hexadecimal digits).  The ID may also be specified as a
 hexadecimal ID by prefixing the value with "0x".
-These IDs are
+Non-zero IDs are
 required when using multimaster replication and each master must have a
-unique ID. Note that this requirement also applies to separate masters
+unique non-zero ID. Note that this requirement also applies to separate masters
 contributing to a glued set of databases.
 If the URL is provided, this directive may be specified
 multiple times, providing a complete list of participating servers
 and their IDs. The fully qualified hostname of each server should be
 used in the supplied URLs. The IDs are used in the "replica id" field
-of all CSNs generated by the specified server. The default value is zero.
+of all CSNs generated by the specified server. The default value is zero, which
+is only valid for single master replication.
 Example:
 .LP
 .nf