diff options
author | Carla Schroder <carla@owncloud.com> | 2014-10-14 10:00:20 -0700 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2014-10-17 00:36:49 +0200 |
commit | 9ed35a377f05a385e741c1ae3bda3fa2d5cb1f1b (patch) | |
tree | 0a39b3fe836fc53ba30fff3623dea349bd60c4e0 /config/config.sample.php | |
parent | c8c182b36eccdf6ec3df9d4658b5c7a6706fb066 (diff) | |
download | nextcloud-server-9ed35a377f05a385e741c1ae3bda3fa2d5cb1f1b.tar.gz nextcloud-server-9ed35a377f05a385e741c1ae3bda3fa2d5cb1f1b.zip |
some small tweaks
Diffstat (limited to 'config/config.sample.php')
-rwxr-xr-x | config/config.sample.php | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index ca79f982961..c0e6b1d362e 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. |