aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2014-10-17 00:35:51 +0200
committerMorris Jobke <hey@morrisjobke.de>2014-10-17 00:35:51 +0200
commitdd747440394b397d3f12a4eb938fe86ad344cb78 (patch)
tree5ad835b4d17427892f306f6f234992259a117767 /config
parent8ec5b402172a87403627816fbe8fbde7669f367f (diff)
downloadnextcloud-server-dd747440394b397d3f12a4eb938fe86ad344cb78.tar.gz
nextcloud-server-dd747440394b397d3f12a4eb938fe86ad344cb78.zip
read config.sample.php options and whitespace fixes
Diffstat (limited to 'config')
-rwxr-xr-xconfig/config.sample.php10
1 files changed, 6 insertions, 4 deletions
diff --git a/config/config.sample.php b/config/config.sample.php
index 597f01c802c..e54591d62e4 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,
@@ -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.
*/