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 | |
| 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')
| -rw-r--r-- | docs/en/rst/administering/categorization.rst | 4 | ||||
| -rw-r--r-- | docs/en/rst/administering/parameters.rst | 5 | ||||
| -rw-r--r-- | docs/en/rst/installing/iis.rst | 3 | ||||
| -rw-r--r-- | docs/en/rst/installing/linux.rst | 7 |
4 files changed, 8 insertions, 11 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 diff --git a/docs/en/rst/installing/iis.rst b/docs/en/rst/installing/iis.rst index d65aef9de..2ae975694 100644 --- a/docs/en/rst/installing/iis.rst +++ b/docs/en/rst/installing/iis.rst @@ -41,8 +41,7 @@ Under :guilabel:`Name`, enter ``index.cgi``. All other default documents can be removed for this application. -.. warning:: Do not delete the default document from the - :guilabel:`Default Website`. +.. warning:: Do not delete the default document from the :guilabel:`Default Website`. Add Handler Mappings ==================== diff --git a/docs/en/rst/installing/linux.rst b/docs/en/rst/installing/linux.rst index f1c69410e..b17998b53 100644 --- a/docs/en/rst/installing/linux.rst +++ b/docs/en/rst/installing/linux.rst @@ -172,12 +172,11 @@ Or, you can pass an individual module name: :command:`./install-module.pl <modulename>` .. note:: If you are using a package-based distribution, and attempting to - install the Perl modules from CPAN (e.g. by using - :file:`install-module.pl`), you may need to install the "development" + install the Perl modules from CPAN (e.g. by using :file:`install-module.pl`), + you may need to install the "development" packages for MySQL and GD before attempting to install the related Perl modules. The names of these packages will vary depending on the specific - distribution you are using, but are often called - :file:`<packagename>-devel`. + distribution you are using, but are often called :file:`<packagename>-devel`. .. _linux-config-webserver: |