WIP

diff --git a/docs/en/rst/index.rst b/docs/en/rst/index.rst
index a55ad13d886d465953389fbbdd6a74daae013778..7a597a855f90d64845f7f29c800e335ce949e944 100644 (file)
--- a/docs/en/rst/index.rst
+++ b/docs/en/rst/index.rst
@@ -15,4 +15,19 @@ Bugzilla Documentation
    administering/index
    using/index
 
+.. toctree::
+   :hidden:
+
+   installing/mysql
+   installing/postgresql
+   installing/oracle
+   installing/sqlite
+
+.. toctree::
+   :hidden:
+
+   installing/apache
+   installing/apache-windows
+   installing/iis
+
 .. todolist::

diff --git a/docs/en/rst/installing/apache.rst b/docs/en/rst/installing/apache.rst
index 03e4c4f055349b50f5325767ac91be14e74d0a9f..7be92cbf9fb28217fb333101784025cac22bdb22 100644 (file)
--- a/docs/en/rst/installing/apache.rst
+++ b/docs/en/rst/installing/apache.rst
@@ -1,6 +1,6 @@
 .. This document is shared among all non-Windows OSes.
 
-.. _apache-linux:
+.. _apache:
 
 Apache
 ######

diff --git a/docs/en/rst/installing/linux.rst b/docs/en/rst/installing/linux.rst
index 0f031b9f1cc58668a7114cf9c274a159773e7191..4a872801abfa44fe787ca38e92cf92496b204daa 100644 (file)
--- a/docs/en/rst/installing/linux.rst
+++ b/docs/en/rst/installing/linux.rst
@@ -188,10 +188,7 @@ Web Server
 Any web server that is capable of running CGI scripts can be made to work.
 We have specific configuration instructions for the following:
 
-.. toctree::
-   :maxdepth: 1
-
-   apache
+* :ref:`apache`
 
 .. _linux-config-database:
 
@@ -201,15 +198,12 @@ Database Engine
 Bugzilla supports MySQL, PostgreSQL, Oracle and SQLite as database servers.
 You only require one of these systems to make use of Bugzilla. MySQL is
 most commonly used. SQLite is good for trial installations as it requires no
-setup. Configure your server according to the instructions below.
-
-.. toctree::
-   :maxdepth: 1
+setup. Configure your server according to the instructions below:
 
-   mysql
-   postgresql
-   oracle
-   sqlite
+* :ref:`mysql`
+* :ref:`postgresql`
+* :ref:`oracle`
+* :ref:`sqlite`
 
 .. |checksetupcommand| replace:: :command:`./checksetup.pl`
 .. |testservercommand| replace:: :command:`./testserver.pl http://<your-bugzilla-server>/`

diff --git a/docs/en/rst/installing/mac-os-x.rst b/docs/en/rst/installing/mac-os-x.rst
index e4f8e265d8fb3874111a5f596153e0799dd54536..77730ce6e3d3d7342325715be36d602673eeacd4 100644 (file)
--- a/docs/en/rst/installing/mac-os-x.rst
+++ b/docs/en/rst/installing/mac-os-x.rst
@@ -89,10 +89,7 @@ Web Server
 Any web server that is capable of running CGI scripts can be made to work.
 We have specific configuration instructions for the following:
 
-.. toctree::
-   :maxdepth: 1
-
-   apache
+* :ref:`apache`
 
 You'll need to create a symbolic link so the webserver can see Bugzilla:
 
@@ -111,17 +108,14 @@ Database Engine
 Bugzilla supports MySQL, PostgreSQL, Oracle and SQLite as database servers.
 You only require one of these systems to make use of Bugzilla. MySQL is
 most commonly used on Mac OS X. Configure your server according to the
-instructions below.
+instructions below:
 
 .. todo:: Has anyone tried anything other than MySQL on Mac OS X?
 
-.. toctree::
-   :maxdepth: 1
-
-   mysql
-   postgresql
-   oracle
-   sqlite
+* :ref:`mysql`
+* :ref:`postgresql`
+* :ref:`oracle`
+* :ref:`sqlite`
 
 .. |checksetupcommand| replace:: :command:`perl checksetup.pl`
 .. |testservercommand| replace:: :command:`perl testserver.pl http://<your-bugzilla-server>/`

diff --git a/docs/en/rst/installing/windows.rst b/docs/en/rst/installing/windows.rst
index bfa42c87c9760589a3cc08613c1ba67bc335de47..5b5da335ade89fdd25ca29fb4e66897324aa4587 100644 (file)
--- a/docs/en/rst/installing/windows.rst
+++ b/docs/en/rst/installing/windows.rst
@@ -100,11 +100,8 @@ Web Server
 Any web server that is capable of running CGI scripts can be made to work.
 We have specific instructions for the following:
 
-.. toctree::
-   :maxdepth: 1
-
-   apache-windows
-   iis
+* :ref:`apache-windows`
+* :ref:`iis`
 
 .. windows-config-database:
 
@@ -115,15 +112,12 @@ Bugzilla supports MySQL, PostgreSQL, Oracle and SQLite as database servers.
 You only require one of these systems to make use of Bugzilla. MySQL is
 most commonly used, and is the only one for which Windows instructions have
 been tested. SQLite is good for trial installations as it requires no
-setup. Configure your server according to the instructions below.
-
-.. toctree::
-   :maxdepth: 1
+setup. Configure your server according to the instructions below:
 
-   mysql
-   postgresql
-   oracle
-   sqlite
+* :ref:`mysql`
+* :ref:`postgresql`
+* :ref:`oracle`
+* :ref:`sqlite`
 
 .. |checksetupcommand| replace:: :command:`checksetup.pl`
 .. |testservercommand| replace:: :command:`testserver.pl http://<your-bugzilla-server>/`