From 4e1923816cc244cf2cb3e2c6fab8a5a668ed2b80 Mon Sep 17 00:00:00 2001 From: Carla Schroder Date: Wed, 30 Sep 2015 08:50:32 -0700 Subject: [PATCH] Markup fixes to trash bin section --- config/config.sample.php | 53 +++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/config/config.sample.php b/config/config.sample.php index e0c486d75c..cf4b25b067 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -417,19 +417,21 @@ $CONFIG = array( * * 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 + * * ``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 */ 'trashbin_retention_obligation' => 'auto', @@ -448,19 +450,24 @@ $CONFIG = array( * ownCloud 8.1 and before. * * Available values: - * ``auto`` default setting. Automatically expire versions according to - * expire rules. Please refer to Files_versions online documentation - * for more info. - * ``D, auto`` keep versions at least for D days, apply expire rules to all - * versions that are older than D days - * * ``auto, D`` delete all versions that are older than D days automatically, - * delete other versions according to expire rules - * * ``D1, D2`` keep versions for at least D1 days and delete when exceeds D2 days - * ``disabled`` versions auto clean disabled, versions will be kept forever + * + * * ``auto`` + * default setting. Automatically expire versions according to expire + * rules. Please refer to Files_versions online documentation for more + * info. + * * ``D, auto`` + * keep versions at least for D days, apply expire rules to all versions + * that are older than D days + * * ``auto, D`` + * delete all versions that are older than D days automatically, delete + * other versions according to expire rules + * * ``D1, D2`` + * keep versions for at least D1 days and delete when exceeds D2 days + * * ``disabled`` + * versions auto clean disabled, versions will be kept forever */ 'versions_retention_obligation' => 'auto', - /** * ownCloud Verifications *