ITS#6394 rid is decimal not hex

[openldap] / doc / man / man5 / slapd.conf.5

diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
index 3b23fd688d32c6b67ed0dc0021c43e222268d003..ff4242e19dac3b6b28021438a37d1fd968e0dfaf 100644 (file)
--- a/doc/man/man5/slapd.conf.5
+++ b/doc/man/man5/slapd.conf.5
@@ -685,6 +685,8 @@ option are only usable if slapd was compiled with \-\-enable\-modules.
 .B modulepath <pathspec>
 Specify a list of directories to search for loadable modules. Typically
 the path is colon-separated but this depends on the operating system.
 .B modulepath <pathspec>
 Specify a list of directories to search for loadable modules. Typically
 the path is colon-separated but this depends on the operating system.

+The default is MODULEDIR, which is where the standard OpenLDAP install
+will place its modules.

 .HP
 .hy 0
 .B objectclass "(\ <oid>\
 .HP
 .hy 0
 .B objectclass "(\ <oid>\


@@ -913,7 +915,8 @@ e.g. ldapi:// (and eventually IPSEC).  It is not normally used.
 .TP
 .B serverID <integer> [<URL>]
 Specify an integer ID from 0 to 4095 for this server (limited
 .TP
 .B serverID <integer> [<URL>]
 Specify an integer ID from 0 to 4095 for this server (limited

-to 3 hexadecimal digits).
+to 3 hexadecimal digits).  The ID may also be specified as a
+hexadecimal ID by prefixing the value with "0x".

 These IDs are
 required when using multimaster replication and each master must have a
 unique ID. Note that this requirement also applies to separate masters
 These IDs are
 required when using multimaster replication and each master must have a
 unique ID. Note that this requirement also applies to separate masters


@@ -959,6 +962,16 @@ more efficiently. The resulting sort order depends on the
 attributes' syntax and matching rules and may not correspond to
 lexical order or any other recognizable order.
 .TP
 attributes' syntax and matching rules and may not correspond to
 lexical order or any other recognizable order.
 .TP

+.B tcp-buffer [listener=<URL>] [{read|write}=]<size>
+Specify the size of the TCP buffer.
+A global value for both read and write TCP buffers related to any listener
+is defined, unless the listener is explicitly specified,
+or either the read or write qualifiers are used.
+See
+.BR tcp (7)
+for details.
+Note that some OS-es implement automatic TCP buffer tuning.
+.TP

 .B threads <integer>
 Specify the maximum size of the primary thread pool.
 The default is 16; the minimum value is 2.
 .B threads <integer>
 Specify the maximum size of the primary thread pool.
 The default is 16; the minimum value is 2.


@@ -1589,6 +1602,11 @@ in order to work over all of the glued databases. E.g.
        overlay syncprov
 .fi
 .RE
        overlay syncprov
 .fi
 .RE

+.TP
+.B sync_use_subentry 
+Store the syncrepl contextCSN in a subentry instead of the context entry
+of the database. The subentry's RDN will be "cn=ldapsync". By default
+the contextCSN is stored in the context entry.

 .HP
 .hy 0
 .B syncrepl rid=<replica ID>
 .HP
 .hy 0
 .B syncrepl rid=<replica ID>


@@ -1645,8 +1663,8 @@ replication engine.
 identifies the current
 .B syncrepl
 directive within the replication consumer site.
 identifies the current
 .B syncrepl
 directive within the replication consumer site.

-It is a non-negative integer not greater than 4095 (limited
-to three hexadecimal digits).
+It is a non-negative integer not greater than 999 (limited
+to three decimal digits).

 
 .B provider
 specifies the replication provider site containing the master content
 
 .B provider
 specifies the replication provider site containing the master content