From 274e2e0c33e2254e02b15df4d8dcdfd38b6c14b7 Mon Sep 17 00:00:00 2001 From: Gervase Markham Date: Tue, 9 Dec 2014 23:13:07 +0000 Subject: Bug 1108812: Travis docs tests are failing when using Sphinx with latest trunk/5.0 builds r=dkl,a=dkl --- docs/en/rst/administering/parameters.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'docs/en/rst/administering/parameters.rst') diff --git a/docs/en/rst/administering/parameters.rst b/docs/en/rst/administering/parameters.rst index 6be8831dc..1a0999093 100644 --- a/docs/en/rst/administering/parameters.rst +++ b/docs/en/rst/administering/parameters.rst @@ -492,9 +492,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 -- cgit v1.2.3-24-g4f1b