read config.sample.php options and whitespace fixes

This commit is contained in:
Morris Jobke 2014-10-17 00:35:51 +02:00
parent 8ec5b40217
commit dd74744039
1 changed files with 6 additions and 4 deletions

View File

@ -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,
@ -665,7 +667,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.
*/