From 15d6677c4e398729280e7bd500330f1cf4bf127b Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Mon, 30 Oct 2000 17:13:38 +0000
Subject: [PATCH] Document threads
---
doc/man/man5/slapd.conf.5 | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
index 4cd798b38c..7da9741245 100644
--- 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
--
GitLab