document the network-timeout directive (ITS#4718)

diff --git a/doc/man/man5/slapd-ldap.5 b/doc/man/man5/slapd-ldap.5
index 28bcc7ebf6856d8f19629801b006d190c4c4072a..a8aae31d8014d1d7b673094d7af96591cca514b5 100644 (file)
--- a/doc/man/man5/slapd-ldap.5
+++ b/doc/man/man5/slapd-ldap.5
@@ -347,6 +347,16 @@ and
 This directive causes a cached connection to be dropped an recreated
 after it has been idle for the specified time.
 
+.TP
+.B network-timeout <time>
+Sets the network timeout value after which
+.BR poll (2)/ select (2) 
+following a 
+.BR connect (2) 
+returns in case of no activity.
+The value is in seconds, and it can be specified as for
+.BR idle-timeout .
+
 .TP
 .B protocol\-version {0,2,3}
 This directive indicates what protocol version must be used to contact

diff --git a/doc/man/man5/slapd-meta.5 b/doc/man/man5/slapd-meta.5
index 95a1603552570ae2740d197350ae268e5b7112d6..ba2653820d1d5f103baeb53bd6d214bfb7d4a92d 100644 (file)
--- a/doc/man/man5/slapd-meta.5
+++ b/doc/man/man5/slapd-meta.5
@@ -86,6 +86,11 @@ should be defined first for clarity, including those that are common
 to all backends.
 They are:
 
+.TP
+.B conn-ttl <time>
+This directive causes a cached connection to be dropped an recreated
+after a given ttl, regardless of being idle or not.
+
 .TP
 .B default-target none
 This directive forces the backend to reject all those operations
@@ -109,11 +114,6 @@ illustrated for the
 .B idle-timeout
 directive.
 
-.TP
-.B conn-ttl <time>
-This directive causes a cached connection to be dropped an recreated
-after a given ttl, regardless of being idle or not.
-
 .TP
 .B onerr {CONTINUE|stop}
 This directive allows to select the behavior in case an error is returned
@@ -282,6 +282,18 @@ This maps object classes and attributes as in the LDAP backend.
 See
 .BR slapd-ldap (5).
 
+.TP
+.B network-timeout <time>
+Sets the network timeout value after which
+.BR poll (2)/ select (2) 
+following a 
+.BR connect (2) 
+returns in case of no activity.
+The value is in seconds, and it can be specified as for
+.BR idle-timeout .
+If set before any target specification, it affects all targets, unless
+overridden by any per-target directive.
+
 .TP
 .B nretries {forever|never|<nretries>}
 This directive defines how many times a bind should be retried