From d9c697534d736e7165114a2f250f9ed9527dcf26 Mon Sep 17 00:00:00 2001 From: kondou Date: Tue, 16 Jul 2013 05:56:52 +0200 Subject: Fix some typos --- config/config.sample.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'config/config.sample.php') diff --git a/config/config.sample.php b/config/config.sample.php index dfa29f329c4..4d1950d60ee 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -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', -- cgit v1.2.3 From 0a9bb8ba73f80fd63592d994c837345698131e9b Mon Sep 17 00:00:00 2001 From: Björn Schießle Date: Fri, 26 Jul 2013 15:15:47 +0200 Subject: reduce time for auto expire to 30 days by default --- apps/files_trashbin/lib/trash.php | 2 +- config/config.sample.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'config/config.sample.php') diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index d09c4d5f7b1..ba940084a87 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -25,7 +25,7 @@ namespace OCA\Files_Trashbin; class Trashbin { // how long do we keep files in the trash bin if no other value is defined in the config file (unit: days) - const DEFAULT_RETENTION_OBLIGATION = 180; + const DEFAULT_RETENTION_OBLIGATION = 30; // unit: percentage; 50% of available disk space/quota const DEFAULTMAXSIZE = 50; diff --git a/config/config.sample.php b/config/config.sample.php index 4d1950d60ee..8d978ea6ee7 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, -- cgit v1.2.3