diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-30 02:34:36 +0400 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-30 02:34:36 +0400 |
| commit | 7425efade78a04f20cb3cc83f964c6a00094b6ce (patch) | |
| tree | 967aa50e8873c88f0adf6f91d0285ab1c54b7189 /config | |
| parent | b4a523927823ab8bc80c5f1fc0d5bd5ef61f8eb8 (diff) | |
| parent | 7c6246fa451c4646dfaa1396dd37e0b3eb9706ba (diff) | |
Merge branch 'master' into oc_preview
Conflicts:
3rdparty
lib/template.php
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.sample.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index 7629414ef16..50dec9e421e 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -114,8 +114,8 @@ $CONFIG = array( /* Password to use for sendmail mail, depends on mail_smtpauth if this is used */ "mail_smtppassword" => "", -/* How long should ownCloud keep deleted files in the trash bin, default value: 180 days */ -'trashbin_retention_obligation' => 180, +/* How long should ownCloud keep deleted files in the trash bin, default value: 30 days */ +'trashbin_retention_obligation' => 30, /* allow user to change his display name, if it is supported by the back-end */ 'allow_user_to_change_display_name' => true, @@ -129,17 +129,17 @@ $CONFIG = array( /* Are we connected to the internet or are we running in a closed network? */ "has_internet_connection" => true, - /* Place to log to, can be owncloud and syslog (owncloud is log menu item in admin menu) */ +/* Place to log to, can be owncloud and syslog (owncloud is log menu item in admin menu) */ "log_type" => "owncloud", -/* File for the owncloud logger to log to, (default is ownloud.log in the data dir */ +/* File for the owncloud logger to log to, (default is ownloud.log in the data dir) */ "logfile" => "", /* Loglevel to start logging at. 0=DEBUG, 1=INFO, 2=WARN, 3=ERROR (default is WARN) */ "loglevel" => "", -/* Append All database query and parameters to the log file. - (whatch out, this option can increase the size of your log file)*/ +/* Append all database queries and parameters to the log file. + (watch out, this option can increase the size of your log file)*/ "log_query" => false, /* Lifetime of the remember login cookie, default is 15 days */ @@ -167,8 +167,8 @@ $CONFIG = array( /* Set an array of path for your apps directories key 'path' is for the fs path and the key 'url' is for the http path to your - applications paths. 'writable' indicate if the user can install apps in this folder. - You must have at least 1 app folder writable or you must set the parameter : appstoreenabled to false + applications paths. 'writable' indicates whether the user can install apps in this folder. + You must have at least 1 app folder writable or you must set the parameter 'appstoreenabled' to false */ array( 'path'=> '/var/www/owncloud/apps', |