diff options
| author | Gervase Markham <gerv@mozilla.org> | 2014-12-10 00:13:07 +0100 |
|---|---|---|
| committer | David Lawrence <dkl@mozilla.com> | 2014-12-10 00:13:07 +0100 |
| commit | 274e2e0c33e2254e02b15df4d8dcdfd38b6c14b7 (patch) | |
| tree | 0ac86842f3782cbfb9769b224ff9e9680138df84 /docs/en/rst/administering | |
| parent | d4ef4b1c44705696270e88f968bb72ef782156cb (diff) | |
| download | bugzilla-274e2e0c33e2254e02b15df4d8dcdfd38b6c14b7.tar.gz bugzilla-274e2e0c33e2254e02b15df4d8dcdfd38b6c14b7.tar.xz | |
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')
| -rw-r--r-- | docs/en/rst/administering/categorization.rst | 4 | ||||
| -rw-r--r-- | docs/en/rst/administering/parameters.rst | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/docs/en/rst/administering/categorization.rst b/docs/en/rst/administering/categorization.rst index 8e0242980..383b9341d 100644 --- a/docs/en/rst/administering/categorization.rst +++ b/docs/en/rst/administering/categorization.rst @@ -399,8 +399,8 @@ example, if you have a bug that you plan to fix for your 3.0 release, it would be assigned the milestone of 3.0. .. note:: Milestone options will only appear for a Product if you turned - on the :param:`usetargetmilestone` parameter in the "Bug Fields" tab of the - :ref:`parameters` page. + on the :param:`usetargetmilestone` parameter in the "Bug Fields" tab of + the :ref:`parameters` page. To create new Milestones and set Default Milestones: 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 |