From 77d34f356833efc786dca5d10179486bd5e7f4d2 Mon Sep 17 00:00:00 2001 From: Sascha Wiswedel Date: Mon, 23 Mar 2020 17:47:24 +0100 Subject: [PATCH] clarified trash bin retention by storage shortage override Signed-off-by: Sascha Wiswedel --- .../configuration_server/config_sample_php_parameters.rst | 2 +- user_manual/files/deleted_file_management.rst | 4 ++++ user_manual/files/quota.rst | 6 +++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/admin_manual/configuration_server/config_sample_php_parameters.rst b/admin_manual/configuration_server/config_sample_php_parameters.rst index 968424cff..7db169eae 100644 --- a/admin_manual/configuration_server/config_sample_php_parameters.rst +++ b/admin_manual/configuration_server/config_sample_php_parameters.rst @@ -683,7 +683,7 @@ Available values: automatically, delete other files anytime if space needed * ``D1, D2`` keep files and folders in the trash bin for at least D1 days and - delete when exceeds D2 days + delete when exceeds D2 days (note: files will not be deleted automatically if space is needed) * ``disabled`` trash bin auto clean disabled, files and folders will be kept forever diff --git a/user_manual/files/deleted_file_management.rst b/user_manual/files/deleted_file_management.rst index 13aef7e50..2e37cc601 100644 --- a/user_manual/files/deleted_file_management.rst +++ b/user_manual/files/deleted_file_management.rst @@ -54,3 +54,7 @@ by setting the ``trashbin_retention_obligation`` value. Files older than the Additionally, Nextcloud calculates the maximum available space every time a new file is added. If the deleted files exceed the new maximum allowed space Nextcloud will expire old deleted files until the limit is met once again. + +.. note:: Your administrator may have configured the trash bin retention period +to override the storage space management. See `admin documentation +`_ for more details. \ No newline at end of file diff --git a/user_manual/files/quota.rst b/user_manual/files/quota.rst index 35e5f9021..618c429d8 100644 --- a/user_manual/files/quota.rst +++ b/user_manual/files/quota.rst @@ -29,8 +29,12 @@ trash bin is set at 50% of quota. Deleted file aging is set at 30 days. When deleted files exceed 50% of quota then the oldest files are removed until the total is below 50%. +.. note:: Your administrator may have configured the trash bin retention period +to override the storage space management. See `admin documentation +`_ for more details. + When version control is enabled, the older file versions are not counted against quotas. -If you create a public share via URL, and allow uploads, any uploaded files +If you create a public share via URL and allow uploads, any uploaded files count against your quota.