Bug 1108812: Travis docs tests are failing when using Sphinx with latest trunk/5...

r=dkl,a=dkl

diff --git a/docs/en/rst/administering/categorization.rst b/docs/en/rst/administering/categorization.rst
index 8e0242980f04b5b0046149dd1e74ae3cc44dd60f..383b9341def32e9ae79f2dd16ba2dfd6732b7b01 100644 (file)
--- 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 8e3e6123157aaf3168e6f8ff922bc390f4d0be87..abfe593e180b9f42c9817b2e6084b6294ccff740 100644 (file)
--- 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

diff --git a/docs/en/rst/installing/iis.rst b/docs/en/rst/installing/iis.rst
index d65aef9de9708dbc566b85bd0577bf60fc52e626..2ae975694b3719b0e1943eb6e03a0eb245316046 100644 (file)
--- 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 97192fac3a27fc9a628a98e38c2c2fd8f9e44419..a29bff99b7166b8636b40a15c1fe9691590e0b98 100644 (file)
--- 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`.
 
    .. todo:: Give examples for Debian/Ubuntu and RedHat.
              Convert this item to a bug after checkin.