[Pkg-owncloud-commits] [owncloud] 18/46: read config.sample.php options and whitespace fixes

[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.

commit d2b766ddee565f80bf0af17beb80499c02543162
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Fri Oct 17 00:35:51 2014 +0200

    read config.sample.php options and whitespace fixes
---
 config/config.sample.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index bb20fbe..60883ab 100755
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -6,7 +6,7 @@
  *
  * DO NOT COMPLETELY BASE YOUR CONFIGURATION FILE ON THIS SAMPLE. THIS MAY BREAK
  * YOUR INSTANCE. Instead, manually copy configuration switches that you
- * consider important for your instance to your working ``config.php``, and 
+ * consider important for your instance to your working ``config.php``, and
  * apply configuration options that are pertinent for your instance.
  *
  * This file is used to generate the config documentation. Please consider
@@ -45,6 +45,7 @@ $CONFIG = array(
  *
  * 'instanceid' => 'd3c944a9a',
  */
+'instanceid' => '',
 
  /**
  * The salt used to hash all passwords, auto-generated by the ownCloud
@@ -54,13 +55,14 @@ $CONFIG = array(
  *
  *'passwordsalt' => 'd3c944a9af095aa08f',
  */
+'passwordsalt' => '',
 
 /**
  * Your list of trusted domains that users can log into. Specifying trusted
  * domains prevents host header poisoning. Do not remove this, as it performs
  * necessary security checks.
  */
-'trusted_domains' => 
+'trusted_domains' =>
   array (
     'demo.example.org',
     'otherdomain.example.org:8080',
@@ -552,7 +554,7 @@ $CONFIG = array(
  * Images files
  * Covers of MP3 files
  * Text documents
- * Valid values are ``true``, to enable previews, or 
+ * Valid values are ``true``, to enable previews, or
  * ``false``, to disable previews
  */
 'enable_previews' => true,
@@ -661,7 +663,7 @@ $CONFIG = array(
  */
 
 /**
- * Blacklist a specific file or files and disallow the upload of files 
+ * Blacklist a specific file or files and disallow the upload of files
  * with this name. ``.htaccess`` is blocked by default.
  * WARNING: USE THIS ONLY IF YOU KNOW WHAT YOU ARE DOING.
  */

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