<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1610,7 +1610,8 @@ create accounts, change password or edit vCard that is stored in LDAP.&lt;/P&gt;&lt;P&gt; &lt;A
 LDAP servers. This option is required.
 &lt;/DD&gt;&lt;DT CLASS=&quot;dt-description&quot;&gt;&lt;B&gt;&lt;TT&gt;{ldap_encrypt, none|tls}&lt;/TT&gt;&lt;/B&gt;&lt;/DT&gt;&lt;DD CLASS=&quot;dd-description&quot;&gt; Type of connection encryption to the LDAP server.
 Allowed values are: &lt;TT&gt;none&lt;/TT&gt;, &lt;TT&gt;tls&lt;/TT&gt;.
-Note that STARTTLS is not supported.
+The value &lt;TT&gt;tls&lt;/TT&gt; enables encryption by using LDAP over SSL.
+Note that STARTTLS encryption is not supported.
 The default value is: &lt;TT&gt;none&lt;/TT&gt;.
 &lt;/DD&gt;&lt;DT CLASS=&quot;dt-description&quot;&gt;&lt;B&gt;&lt;TT&gt;{ldap_port, Number}&lt;/TT&gt;&lt;/B&gt;&lt;/DT&gt;&lt;DD CLASS=&quot;dd-description&quot;&gt; Port to connect to your LDAP server.
 The default port is&amp;#XA0;389 if encryption is disabled; and 636 if encryption is enabled.</diff>
      <filename>doc/guide.html</filename>
    </modified>
    <modified>
      <diff>@@ -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.</diff>
      <filename>doc/guide.tex</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>860e444502b46cc555a00e788935569280a58679</id>
    </parent>
  </parents>
  <author>
    <name>badlop</name>
    <email>badlop@1613c18e-e6f4-0310-972c-c3fad1d2be73</email>
  </author>
  <url>http://github.com/bjc/ejabberd/commit/eff01d6d5df7df8a3b7341baa5eacfd23d9a2101</url>
  <id>eff01d6d5df7df8a3b7341baa5eacfd23d9a2101</id>
  <committed-date>2009-11-04T12:18:23-08:00</committed-date>
  <authored-date>2009-11-04T12:18:23-08:00</authored-date>
  <message>Extend explanation of ldap_encrypt tls (thanks to Konstantin Khomoutov)

git-svn-id: https://svn.process-one.net/ejabberd/trunk@2727 1613c18e-e6f4-0310-972c-c3fad1d2be73</message>
  <tree>b1ebc400e6307afd67fe5f3a75e37e76c1a92eee</tree>
  <committer>
    <name>badlop</name>
    <email>badlop@1613c18e-e6f4-0310-972c-c3fad1d2be73</email>
  </committer>
</commit>
