[Pkg-owncloud-commits] [owncloud-doc] 09/12: update documentation generated 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 e77045f8c67133266cc05681bfb7742a07274152
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Tue Nov 4 09:26:34 2014 +0100

    update documentation generated from config.sample.php
---
 .../configuration_config_sample_php.rst             | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/admin_manual/configuration/configuration_config_sample_php.rst b/admin_manual/configuration/configuration_config_sample_php.rst
index f9ce1bf..a985bb2 100644
--- a/admin_manual/configuration/configuration_config_sample_php.rst
+++ b/admin_manual/configuration/configuration_config_sample_php.rst
@@ -111,6 +111,15 @@ Prefix for the ownCloud tables in the database.
 
 ::
 
+	'dbdriveroptions' => array(
+		PDO::MYSQL_ATTR_SSL_CA => '/file/path/to/ca_cert.pem',
+	),
+
+Additional driver options for the database connection, eg. to enable SSL
+encryption in MySQL.
+
+::
+
 	'installed' => false,
 
 Indicates whether the ownCloud instance was installed successfully; ``true``
@@ -418,10 +427,10 @@ addresses starting with ``10.0.0.`` and ending with 1 to 3:
 
 	'overwrite.cli.url' => '',
 
-Use this configuration parameter to specify the base url for any urls which are
-generated within ownCloud using any kind of command line tools (cron or occ).
-
-The value should contain the full base URL: ``https://www.example.com/owncloud``
+Use this configuration parameter to specify the base url for any urls which
+are generated within ownCloud using any kind of command line tools (cron or
+occ). The value should contain the full base URL:
+``https://www.example.com/owncloud``
 
 ::
 
@@ -447,8 +456,8 @@ These parameters control the Deleted files app.
 
 	'trashbin_retention_obligation' => 30,
 
-When the trash bin app is enabled (default), this is the number of days a file
-will be kept in the trash bin. Default is 30 days.
+When the trash bin app is enabled (default), this is the number of days a
+file will be kept in the trash bin. Default is 30 days.
 
 ::
 

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