aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2016-02-17 12:33:03 +0100
committerFrédéric Buclin <LpSolit@gmail.com>2016-02-17 12:33:03 +0100
commitdaf1022807acee54bd221492e5871b5cbcc5ae09 (patch)
treed37eb4d8472e31614fc967b55d07a8fa5d9611e3
parentTravis CI config file no longer necessary (diff)
downloadgentoo-bugzilla-daf1022807acee54bd221492e5871b5cbcc5ae09.zip
gentoo-bugzilla-daf1022807acee54bd221492e5871b5cbcc5ae09.tar.gz
gentoo-bugzilla-daf1022807acee54bd221492e5871b5cbcc5ae09.tar.bz2
Bug 1242263: The web server and SQL server sections are not correctly referenced in the documentation
r=gerv
-rw-r--r--docs/en/rst/index.rst17
-rw-r--r--docs/en/rst/installing/apache-windows.rst4
-rw-r--r--docs/en/rst/installing/db_server.rst18
-rw-r--r--docs/en/rst/installing/index.rst2
-rw-r--r--docs/en/rst/installing/web_server.rst13
5 files changed, 35 insertions, 19 deletions
diff --git a/docs/en/rst/index.rst b/docs/en/rst/index.rst
index b877920..8f6b612 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 fca8ef5..c119e1b 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 0000000..8a7d896
--- /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 91a81be..06d0276 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 0000000..42f9a00
--- /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