From: Pierangelo Masarati <ando@openldap.org>
Date: Tue, 26 Sep 2006 02:54:34 +0000 (+0000)
Subject: document VERSION, TIMEOUT and NETWORK_TIMEOUT options
X-Git-Tag: OPENLDAP_REL_ENG_2_3_MP~93
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=18450addda31ff277e70377b09be86fc12fd3db0;p=openldap

document VERSION, TIMEOUT and NETWORK_TIMEOUT options
---

diff --git a/doc/man/man5/ldap.conf.5 b/doc/man/man5/ldap.conf.5
index 4137200d40..344e9726c8 100644
--- a/doc/man/man5/ldap.conf.5
+++ b/doc/man/man5/ldap.conf.5
@@ -159,6 +159,16 @@ Aliases are only dereferenced when locating the base object of the search.
 Aliases are dereferenced both in searching and in locating the base object
 of the search.
 .RE
+.TP
+.B VERSION {2|3}
+Specifies what version of the LDAP protocol should be used.
+.TP
+.B TIMEOUT <integer>
+Specifies a generic timeout (in seconds).  Currently ignored.
+.TP
+.B NETWORK_TIMEOUT <integer>
+Specifies the timeout (in seconds) after which the poll(2)/select(2)
+following a connect(2) returns in case of no activity.
 .SH SASL OPTIONS
 If OpenLDAP is built with Simple Authentication and Security Layer support,
 there are more options you can specify.