Document threads

diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
index 4cd798b38c79ea946feddea29fe029c3a547f880..7da974124504bcc6b16dbe8d8e484c1bc9c0419f 100644 (file)
--- a/doc/man/man5/slapd.conf.5
+++ b/doc/man/man5/slapd.conf.5
@@ -1,7 +1,7 @@
-.TH SLAPD.CONF 5 "23 August 2000" "OpenLDAP LDVERSION"
-.\" $OpenLDAP$
+.TH SLAPD.CONF 5 "17 October 2000" "OpenLDAP LDVERSION"
 .\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
+.\" $OpenLDAP$
 .SH NAME
 slapd.conf \- configuration file for slapd, the stand-alone LDAP daemon
 .SH SYNOPSIS
@@ -121,6 +121,7 @@ SubstringAssertion NISnetgrouptriple Bootparameter
 .TP
 .B concurrency <integer>
 Specify a desired level of concurrency.  Provided to the underlying
+<<<<<<< slapd.conf.5
 thread system as a hint.  The default is not to provdide any hint.
 .HP
 .B defaultaccess { none | auth | compare | search | read | write }
@@ -132,6 +133,9 @@ recommended that
 .B access
 directives be used instead.
 .RE
+=======
+thread system as a hint.  The default is not to provide any hint.
+>>>>>>> 1.57
 .TP
 .B defaultsearchbase <dn>
 Specify a default search base to use when client submits a
@@ -375,10 +379,6 @@ Specify the srvtab file in which the kerberos keys necessary for
 authenticating clients using kerberos can be found. This option is only
 meaningful if you are using Kerberos authentication.
 .TP
-.B timelimit <integer>
-Specify the maximum number of seconds (in real time)
-require forward secrecy between sessions.
-.TP
 .B schemacheck { on | off }
 Turn schema checking on or off. The default is on.
 .TP
@@ -391,6 +391,10 @@ Specify the srvtab file in which the kerberos keys necessary for
 authenticating clients using kerberos can be found. This option is only
 meaningful if you are using Kerberos authentication.
 .TP
+.B threads <integer>
+Specify the maximum size of the primary thread pool.
+The default is 32.
+.TP
 .B timelimit <integer>
 Specify the maximum number of seconds (in real time)
 .B slapd