diff options
| author | Gervase Markham <gerv@mozilla.org> | 2014-12-09 23:13:07 +0000 |
|---|---|---|
| committer | David Lawrence <dkl@mozilla.com> | 2014-12-09 23:14:19 +0000 |
| commit | 8742f367535731b733d84bfcd0b24d2c884df6dc (patch) | |
| tree | da7b193375c79c96b5489a8d4ee36c56b6630399 /docs/en/rst/administering/parameters.rst | |
| parent | 0b7886dee88bfdc543855d13a8a3d3e25e675437 (diff) | |
| download | bugs-8742f367535731b733d84bfcd0b24d2c884df6dc.tar bugs-8742f367535731b733d84bfcd0b24d2c884df6dc.tar.gz bugs-8742f367535731b733d84bfcd0b24d2c884df6dc.tar.bz2 bugs-8742f367535731b733d84bfcd0b24d2c884df6dc.tar.xz bugs-8742f367535731b733d84bfcd0b24d2c884df6dc.zip | |
Bug 1108812: Travis docs tests are failing when using Sphinx with latest trunk/5.0 builds
r=dkl,a=dkl
Diffstat (limited to 'docs/en/rst/administering/parameters.rst')
| -rw-r--r-- | docs/en/rst/administering/parameters.rst | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/docs/en/rst/administering/parameters.rst b/docs/en/rst/administering/parameters.rst index 8e3e61231..abfe593e1 100644 --- a/docs/en/rst/administering/parameters.rst +++ b/docs/en/rst/administering/parameters.rst @@ -495,9 +495,8 @@ LDAPserver .. note:: In order to use SSL with LDAP, specify a URI with "ldaps://". This will force the use of SSL over port 636. - For example, normal LDAP - :paramval:`ldap://ldap.company.com`, LDAP over SSL - :paramval:`ldaps://ldap.company.com`, or LDAP over a UNIX + For example, normal LDAP :paramval:`ldap://ldap.company.com`, LDAP over + SSL :paramval:`ldaps://ldap.company.com`, or LDAP over a UNIX domain socket :paramval:`ldapi://%2fvar%2flib%2fldap_sock`. LDAPstarttls |