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/installing | |
| 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/installing')
| -rw-r--r-- | docs/en/rst/installing/iis.rst | 3 | ||||
| -rw-r--r-- | docs/en/rst/installing/linux.rst | 7 |
2 files changed, 4 insertions, 6 deletions
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 97192fac3..a29bff99b 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`. .. todo:: Give examples for Debian/Ubuntu and RedHat. Convert this item to a bug after checkin. |