From: Frédéric Buclin <LpSolit@gmail.com>
Date: Wed, 17 Feb 2016 11:33:03 +0000 (+0100)
Subject: Bug 1242263: The web server and SQL server sections are not correctly referenced... 
X-Git-Tag: release-5.0.3~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=daf1022807acee54bd221492e5871b5cbcc5ae09;p=thirdparty%2Fbugzilla.git

Bug 1242263: The web server and SQL server sections are not correctly referenced in the documentation
r=gerv
---

diff --git a/docs/en/rst/index.rst b/docs/en/rst/index.rst
index b877920c64..8f6b61243e 100644
--- a/docs/en/rst/index.rst
+++ b/docs/en/rst/index.rst
@@ -12,20 +12,3 @@ Bugzilla Documentation
    administering/index
    integrating/index
    api/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-windows.rst b/docs/en/rst/installing/apache-windows.rst
index fca8ef5eb9..c119e1b131 100644
--- a/docs/en/rst/installing/apache-windows.rst
+++ b/docs/en/rst/installing/apache-windows.rst
@@ -1,7 +1,7 @@
 .. _apache-windows:
 
-Apache
-######
+Apache on Windows
+#################
 
 Bugzilla supports all versions of Apache 2.2.x and 2.4.x.
 
diff --git a/docs/en/rst/installing/db_server.rst b/docs/en/rst/installing/db_server.rst
new file mode 100644
index 0000000000..8a7d89633b
--- /dev/null
+++ b/docs/en/rst/installing/db_server.rst
@@ -0,0 +1,18 @@
+.. _db_server:
+
+Database Server
+###############
+
+Bugzilla requires a database to store its data. We recommend either MySQL or
+PostgreSQL for production installations. Oracle 10 should work fine, but very
+little or no testing has been done with Oracle 11 and 12. SQLite is easy to
+configure but, due to its limitations, it should only be used for testing
+purposes and very small installations.
+
+.. toctree::
+   :maxdepth: 1
+
+   mysql
+   postgresql
+   oracle
+   sqlite
diff --git a/docs/en/rst/installing/index.rst b/docs/en/rst/installing/index.rst
index 91a81bede6..06d0276803 100644
--- a/docs/en/rst/installing/index.rst
+++ b/docs/en/rst/installing/index.rst
@@ -25,6 +25,8 @@ case, you may want to read the :ref:`Quick Start instructions <quick-start>`.
    linux
    windows
    mac-os-x
+   web_server
+   db_server
    essential-post-install-config
    optional-post-install-config
    migrating
diff --git a/docs/en/rst/installing/web_server.rst b/docs/en/rst/installing/web_server.rst
new file mode 100644
index 0000000000..42f9a00b7e
--- /dev/null
+++ b/docs/en/rst/installing/web_server.rst
@@ -0,0 +1,13 @@
+.. _web_server:
+
+Web Server
+##########
+
+Bugzilla requires a web server to run CGI scripts. It supports the following:
+
+.. toctree::
+   :maxdepth: 1
+
+   apache
+   apache-windows
+   iis