From 0bd34d9868b25ea4eeec165b94d354f827e712d9 Mon Sep 17 00:00:00 2001 From: Valdnet <47037905+Valdnet@users.noreply.github.com> Date: Sun, 27 Sep 2020 19:42:11 +0200 Subject: [PATCH 1/3] Reconstruction of the sentence for deleted files --- user_manual/files/deleted_file_management.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/user_manual/files/deleted_file_management.rst b/user_manual/files/deleted_file_management.rst index d273c581b..b2925f096 100644 --- a/user_manual/files/deleted_file_management.rst +++ b/user_manual/files/deleted_file_management.rst @@ -53,7 +53,8 @@ by setting the ``trashbin_retention_obligation`` value. Files older than the ``trashbin_retention_obligation`` value will be deleted permanently. 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. +Nextcloud will permanently delete old removed files which will expire 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 + to override the storage space management. See `admin documentation `_ for more details. From 65fcd1e8633a45dac5b982b5a0462c6a9f32a7b9 Mon Sep 17 00:00:00 2001 From: Valdnet <47037905+Valdnet@users.noreply.github.com> Date: Sun, 27 Sep 2020 19:51:21 +0200 Subject: [PATCH 2/3] Improving the style and separating the trashbin --- user_manual/files/deleted_file_management.rst | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/user_manual/files/deleted_file_management.rst b/user_manual/files/deleted_file_management.rst index b2925f096..a021ea1d0 100644 --- a/user_manual/files/deleted_file_management.rst +++ b/user_manual/files/deleted_file_management.rst @@ -2,10 +2,9 @@ Managing deleted files ====================== -When you delete a file in Nextcloud, it is not immediately deleted permanently. -Instead, it is moved into the trash bin. It is not permanently deleted until -you manually delete it, or when the Deleted Files app deletes it to make room -for new files. +When you delete a file in Nextcloud, it is not immediately deleted permanently, +only moved into the trash bin. It is not permanently deleted until you manually +delete it, or when the Deleted Files app deletes it to make room for new files. Find your deleted files by clicking on the **Deleted files** button on the Files page of the Nextcloud Web interface. You'll have options to @@ -26,7 +25,7 @@ scenario illustrates: 1. User1 shares a folder "test" with User2 and User3 2. User2 (the recipient) deletes a file/folder "sub" inside of "test" -3. The folder "sub" will be moved to the trashbin of both User1 (owner) and +3. The folder "sub" will be moved to the trash bin of both User1 (owner) and User2 (recipient) 4. But User3 will not have a copy of "sub" in their trash bin From 4cee238cc0ce1bb994c9e28174c7034ecf182ea6 Mon Sep 17 00:00:00 2001 From: Valdnet <47037905+Valdnet@users.noreply.github.com> Date: Tue, 29 Sep 2020 09:24:21 +0200 Subject: [PATCH 3/3] Changing the context of a sentence --- user_manual/files/deleted_file_management.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_manual/files/deleted_file_management.rst b/user_manual/files/deleted_file_management.rst index a021ea1d0..0e0f8b4e6 100644 --- a/user_manual/files/deleted_file_management.rst +++ b/user_manual/files/deleted_file_management.rst @@ -52,8 +52,8 @@ by setting the ``trashbin_retention_obligation`` value. Files older than the ``trashbin_retention_obligation`` value will be deleted permanently. 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 permanently delete old removed files which will expire until the -limit is met once again. +Nextcloud will permanently delete those trashed files with the soonest expiration +until the space limit is met again. .. note:: Your administrator may have configured the trash bin retention period to override the storage space management. See `admin documentation `_ for more details.