aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/guide.html3
-rw-r--r--doc/guide.tex3
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/guide.html b/doc/guide.html
index 08f8bb14a..9943f4264 100644
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -1620,7 +1620,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 57a754548..61ae46547 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -2163,7 +2163,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.