From 3ed3c94a15ee223408a1dbf52bf09cfd51cf28ec Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Wed, 4 Nov 2009 20:18:23 +0000
Subject: [PATCH] Extend explanation of ldap_encrypt tls (thanks to Konstantin
 Khomoutov)

SVN Revision: 2727
---
 doc/guide.html | 3 ++-
 doc/guide.tex  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/guide.html b/doc/guide.html
index 9520f4b70..e9b382a14 100644
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -1610,7 +1610,8 @@ create accounts, change password or edit vCard that is stored in LDAP.</P><P> <A
 LDAP servers. This option is required.
 </DD><DT CLASS="dt-description"><B><TT>{ldap_encrypt, none|tls}</TT></B></DT><DD CLASS="dd-description"> Type of connection encryption to the LDAP server.
 Allowed values are: <TT>none</TT>, <TT>tls</TT>.
-Note that STARTTLS is not supported.
+The value <TT>tls</TT> enables encryption by using LDAP over SSL.
+Note that STARTTLS encryption is not supported.
 The default value is: <TT>none</TT>.
 </DD><DT CLASS="dt-description"><B><TT>{ldap_port, Number}</TT></B></DT><DD CLASS="dd-description"> Port to connect to your LDAP server.
 The default port is&#XA0;389 if encryption is disabled; and 636 if encryption is enabled.
diff --git a/doc/guide.tex b/doc/guide.tex
index ca72e2982..b8669b840 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -2148,7 +2148,8 @@ Parameters:
 LDAP servers. This option is required.
 \titem{\{ldap\_encrypt, none|tls\}} \ind{options!ldap\_encrypt}Type of connection encryption to the LDAP server.
 Allowed values are: \term{none}, \term{tls}.
-Note that STARTTLS is not supported.
+The value \term{tls} enables encryption by using LDAP over SSL.
+Note that STARTTLS encryption is not supported.
 The default value is: \term{none}.
 \titem{\{ldap\_port, Number\}} \ind{options!ldap\_port}Port to connect to your LDAP server.
 The default port is~389 if encryption is disabled; and 636 if encryption is enabled.