[Pkg-owncloud-commits] [owncloud-doc] 17/33: generate documentation from config.sample.php

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud-doc.

commit 8d2fb6cc1d8755bda77835cba19c3f5955411802
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Wed Dec 3 13:16:10 2014 +0100

    generate documentation from config.sample.php
---
 .../configuration/config_sample_php_parameters.rst   | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/admin_manual/configuration/config_sample_php_parameters.rst b/admin_manual/configuration/config_sample_php_parameters.rst
index 58d1e61..6412258 100644
--- a/admin_manual/configuration/config_sample_php_parameters.rst
+++ b/admin_manual/configuration/config_sample_php_parameters.rst
@@ -70,8 +70,15 @@ during installation and update, so you shouldn't need to change it.
 
 	'dbtype' => 'sqlite',
 
-Identifies the database used with this installation: ``sqlite``, ``mysql``,
-``pgsql``, ``oci``, or ``mssql``.
+Identifies the database used with this installation. See also config option
+``supportedDatabases``
+
+Available:
+	- sqlite (SQLite3 - Community Edition Only)
+	- mysql (MySQL)
+	- pgsql (PostgreSQL)
+	- oci (Oracle - Enterprise Edition Only)
+	- mssql (Microsoft SQL Server - Enterprise Edition Only)
 
 ::
 
@@ -949,15 +956,14 @@ One way to test is applying for a trystack account at http://trystack.org/
 		'mssql'
 	),
 
-Database types that are supported for installation. (SQLite is available only in
-ownCloud Community Edition, oci and mssql only for the Enterprise Edition)
+Database types that are supported for installation.
 
 Available:
-	- sqlite (SQLite3)
+	- sqlite (SQLite3 - Community Edition Only)
 	- mysql (MySQL)
 	- pgsql (PostgreSQL)
-	- oci (Oracle)
-	- mssql (Microsoft SQL Server)
+	- oci (Oracle - Enterprise Edition Only)
+	- mssql (Microsoft SQL Server - Enterprise Edition Only)
 
 ::
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-doc.git