[Pkg-owncloud-commits] [owncloud] 16/46: some small tweaks

[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 9ed35a377f05a385e741c1ae3bda3fa2d5cb1f1b
Author: Carla Schroder <carla at owncloud.com>
Date:   Tue Oct 14 10:00:20 2014 -0700

    some small tweaks
---
 config/config.sample.php | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index ca79f98..c0e6b1d 100755
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -5,8 +5,9 @@
  * configuration options and their usage.
  *
  * DO NOT COMPLETELY BASE YOUR CONFIGURATION FILE ON THIS SAMPLE. THIS MAY BREAK
- * YOUR INSTANCE. Instead, manually copy configurations switches that you
- * consider important for your instance to your configuration.
+ * YOUR INSTANCE. Instead, manually copy configuration switches that you
+ * 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
  * following requirements of the current parser:
@@ -38,14 +39,17 @@ $CONFIG = array(
 
 /**
  * This is a unique identifier for your ownCloud installation, created
- * automatically by the installer. Do not change it.
+ * automatically by the installer. This example is for documentation only,
+ * and you should never use it because it will not work. A valid ``instanceid``
+ * is created when you install ownCloud.
  */
 'instanceid' => 'd3c944a9a',
 
 /**
  * The salt used to hash all passwords, auto-generated by the ownCloud
  * installer. (There are also per-user salts.) If you lose this salt you lose
- * all your passwords.
+ * all your passwords. This example is for documentation only,
+ * and you should never use it.
  */
 'passwordsalt' => 'd3c944a9af095aa08f',
 
@@ -56,8 +60,8 @@ $CONFIG = array(
  */
 'trusted_domains' => 
   array (
-    0 => 'demo.example.org',
-    1 => 'otherdomain.example.org:8080',
+    'demo.example.org',
+    'otherdomain.example.org:8080',
   ),
 
 
@@ -542,7 +546,12 @@ $CONFIG = array(
  */
 
 /**
- * TODO
+ * By default, ownCloud can generate previews for the following filetypes:
+ * Images files
+ * Covers of MP3 files
+ * Text documents
+ * Valid values are ``true``, to enable previews, or 
+ * ``false``, to disable previews
  */
 'enable_previews' => true,
 /**
@@ -651,10 +660,10 @@ $CONFIG = array(
 
 /**
  * Blacklist a specific file or files and disallow the upload of files 
- * with this name
+ * with this name. ``.htaccess`` is blocked by default.
  * WARNING: USE THIS ONLY IF YOU KNOW WHAT YOU ARE DOING.
  */
-'blacklisted_files' => array('filename1', 'filename2'),
+'blacklisted_files' => array('.htaccess'),
 
 /**
  * Define a default folder for shared files and folders other than root.

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