From 087d437bb9ae40117065c56b09e677fff3ccc092 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Thu, 13 Aug 2015 03:35:12 +0200 Subject: [PATCH] generate documentation from config.sample.php --- .../config_sample_php_parameters.rst | 34 ++++++++++++++----- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/admin_manual/configuration_server/config_sample_php_parameters.rst b/admin_manual/configuration_server/config_sample_php_parameters.rst index 4844aaa5f..a9d5aad65 100644 --- a/admin_manual/configuration_server/config_sample_php_parameters.rst +++ b/admin_manual/configuration_server/config_sample_php_parameters.rst @@ -483,17 +483,35 @@ These parameters control the Deleted files app. :: - 'trashbin_retention_obligation' => 30, + 'trashbin_retention_obligation' => 'auto', -When the trash bin app is enabled (default), this is the number of days a -file will be kept in the trash bin. Default is 30 days. +If the trash bin app is enabled (default), this setting defines the policy +for when files and folders in the trash bin will be permanently deleted. -:: +The app allows for two settings, a minimum time for trash bin retention, +and a maximum time for trash bin retention. +Minimum time is the number of days a file will be kept, after which it +may be deleted. Maximum time is the number of days at which it is guaranteed +to be deleted. +Both minimum and maximum times can be set together to explicitly define +file and folder deletion. For migration purposes, this setting is installed +initially set to "auto", which is equivalent to the default setting in +ownCloud 8.1 and before. - 'trashbin_auto_expire' => true, - -Disable or enable auto-expiration for the trash bin. By default -auto-expiration is enabled. +Available values: + ``auto`` default setting. keeps files and folders in the trash bin + for 30 days and automatically deletes anytime after that + if space is needed (note: files may not be deleted if space + is not needed). + ``D, auto`` keeps files and folders in the trash bin for D+ days, + delete anytime if space needed (note: files may not be deleted + if space is not needed) +* ``auto, D`` delete all files in the trash bin that are older than D days + automatically, delete other files anytime if space needed +* ``D1, D2`` keep files and folders the in trash bin for at least D1 days + and delete when exceeds D2 days + ``disabled`` trash bin auto clean disabled, files and folders will be + kept forever ownCloud Verifications ----------------------