Merge branch 'master' into fix-5388-master

1 files changed, 11 insertions, 2 deletions

diff --git a/config/config.sample.php b/config/config.sample.php
index 105d4759cc1..1070ef72eda 100644..100755
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -114,9 +114,15 @@ $CONFIG = array(
 /* Password to use for sendmail mail, depends on mail_smtpauth if this is used */
 "mail_smtppassword" => "",
 
+/* memcached hostname and port (Only used when xCache, APC and APCu are absent.) */
+"memcached_server" => array('localhost', 11211),
+
 /* How long should ownCloud keep deleted files in the trash bin, default value:  30 days */
 'trashbin_retention_obligation' => 30,
 
+/* Disable/Enable auto expire for the trash bin, by default auto expire is enabled */
+'trashbin_auto_expire' => true,
+
 /* allow user to change his display name, if it is supported by the back-end */
 'allow_user_to_change_display_name' => true,
 
@@ -185,8 +191,8 @@ $CONFIG = array(
 // "datadirectory" => "",
 
 /* Enable maintenance mode to disable ownCloud
-   If you want to prevent users to login to ownCloud before you start doing some maintenance work, 
-   you need to set the value of the maintenance parameter to true. 
+   If you want to prevent users to login to ownCloud before you start doing some maintenance work,
+   you need to set the value of the maintenance parameter to true.
    Please keep in mind that users who are already logged-in are kicked out of ownCloud instantly.
 */
 "maintenance" => false,
@@ -235,4 +241,7 @@ $CONFIG = array(
 'openssl' => array(
 	//'config' => '/absolute/location/of/openssl.cnf',
 ),
+
+/* whether usage of the instance should be restricted to admin users only */
+'singleuser' => false,
 );