[Pkg-owncloud-commits] [owncloud-doc] 03/23: Backport #1682 to stable7

[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 a3ab4a2373f70b55fc27fc41eb37c3d6ccadf50a
Author: RealRancor <Fisch.666 at gmx.de>
Date:   Wed Sep 23 15:21:23 2015 +0200

    Backport #1682 to stable7
---
 admin_manual/configuration/config_sample_php_parameters.rst | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/admin_manual/configuration/config_sample_php_parameters.rst b/admin_manual/configuration/config_sample_php_parameters.rst
index 2d6ce6c..71178b8 100644
--- a/admin_manual/configuration/config_sample_php_parameters.rst
+++ b/admin_manual/configuration/config_sample_php_parameters.rst
@@ -2,9 +2,14 @@ Config.php Parameters
 =====================
 ownCloud uses the ``config/config.php`` file to control server operations.
 ``config/config.sample.php`` lists all the configurable parameters within
-ownCloud. This document provides a more detailed reference. Many options are
-configurable on your Admin page, so it is usually not necessary to edit
-``config/config.php``.
+ownCloud along with example or default values. This document provides a more
+detailed reference. Many options are configurable on your Admin page, so it
+is usually not necessary to edit ``config/config.php``.
+
+.. note:: The installer creates a config containing the essential parameters.
+   Only manually add config parameters to ``config/config.php`` if you need to
+   use a special value for a parameter. Do not copy everything from
+   ``config/config.sample.php``.
 
 .. Generated content below. Don't change this.
 .. DEFAULT_SECTION_START

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