[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3295-g40c5100

[Karolin Seeger]

The branch, v3-2-test has been updated
       via  40c510097a43edd10f6b5cd376a2cf6eca1f7e8b (commit)
      from  3a8ca8406e72c2029ccbe050069da010642baf14 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 40c510097a43edd10f6b5cd376a2cf6eca1f7e8b
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Dec 19 12:12:59 2008 +0100

    correct the description of the "ldap timeout" parameter
    (cherry picked from commit 1aff97bc48844afba5de48447fdcdcc02d163a97)

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/smbdotconf/ldap/ldaptimeout.xml |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/ldap/ldaptimeout.xml b/docs-xml/smbdotconf/ldap/ldaptimeout.xml
index 9c34ac8..5bc2699 100644
--- a/docs-xml/smbdotconf/ldap/ldaptimeout.xml
+++ b/docs-xml/smbdotconf/ldap/ldaptimeout.xml
@@ -5,9 +5,7 @@
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
-	When Samba connects to an ldap server that server may be down or unreachable. To prevent Samba from hanging whilst
-	waiting for the connection this parameter specifies in seconds how long Samba should wait before failing the 
-	connect. The default is to only wait fifteen seconds for the ldap server to respond to the connect request.
+	This parameter defines the number of seconds that Samba should use as timeout for LDAP operations.
 	</para>
 </description>
 <value type="default">15</value>


-- 
Samba Shared Repository