From: Eric Covener <covener@apache.org>
Date: Sun, 24 Jan 2010 20:58:41 +0000 (+0000)
Subject: fix my r896956 which made LDAP_OPT_NETWORK_TIMEOUT seem more powerful due to
X-Git-Tag: 2.2.15~104
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ab82a2743d9d4fd8c2a92dfde0aeff4feb4f70b;p=thirdparty%2Fapache%2Fhttpd.git

fix my r896956 which made LDAP_OPT_NETWORK_TIMEOUT seem more powerful due to
my misunderstanding.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@902643 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/mod_ldap.html.en b/docs/manual/mod/mod_ldap.html.en
index 1de839489cd..0598a4021e5 100644
--- a/docs/manual/mod/mod_ldap.html.en
+++ b/docs/manual/mod/mod_ldap.html.en
@@ -442,10 +442,9 @@ by other LDAP modules</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_ldap</td></tr>
 </table>
     <p>This directive configures the LDAP_OPT_NETWORK_TIMEOUT option in the
-    underlying LDAP client library, when available.  This value typically 
-    controls how long the LDAP client library will wait for various network 
-    calls to complete, including establishing a connection to the target LDAP 
-    server.</p>
+    underlying LDAP client library, when available.  This value typically
+    controls how long the LDAP client library will wait for the TCP connection
+    to the LDAP server to complete.</p>
 
     <p> If a connection is not successful with the timeout period, either an error will be 
     returned or the LDAP client library will attempt to connect to a secondary LDAP 
diff --git a/docs/manual/mod/mod_ldap.xml b/docs/manual/mod/mod_ldap.xml
index ced4f26c343..3402325677c 100644
--- a/docs/manual/mod/mod_ldap.xml
+++ b/docs/manual/mod/mod_ldap.xml
@@ -567,10 +567,9 @@ connection client certificates.</description>
 
 <usage>
     <p>This directive configures the LDAP_OPT_NETWORK_TIMEOUT option in the
-    underlying LDAP client library, when available.  This value typically 
-    controls how long the LDAP client library will wait for various network 
-    calls to complete, including establishing a connection to the target LDAP 
-    server.</p>
+    underlying LDAP client library, when available.  This value typically
+    controls how long the LDAP client library will wait for the TCP connection
+    to the LDAP server to complete.</p>
 
     <p> If a connection is not successful with the timeout period, either an error will be 
     returned or the LDAP client library will attempt to connect to a secondary LDAP