[Pkg-owncloud-commits] [owncloud-doc] 41/71: document deleted shared file behavior

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud-doc.

commit 93b782e176703613c9602c53c3341e3b012d0405
Author: Carla Schroder <carla at owncloud.com>
Date:   Fri Apr 10 10:39:54 2015 -0700

    document deleted shared file behavior
    
    Conflicts:
    	user_manual/files/deletedfiles.rst
---
 user_manual/files/deletedfiles.rst | 116 +++++++++++++++++--------------------
 1 file changed, 54 insertions(+), 62 deletions(-)

diff --git a/user_manual/files/deletedfiles.rst b/user_manual/files/deletedfiles.rst
index a8d7028..d0aa5d3 100644
--- a/user_manual/files/deletedfiles.rst
+++ b/user_manual/files/deletedfiles.rst
@@ -1,65 +1,57 @@
+======================
 Managing Deleted Files
 ======================
 
-ownCloud maintains a copy of deleted files in case you need them again. To
-ensure that individual users do not run out of memory, the Files app manages
-the total memory size of deleted files for each user. When it comes to managing
-deleted files, keep the following in mind:
-
-* The total memory allocation for deleted files can never exceed more that 50%
-  of the currently available free space for each user.
-
-* Once the 50% maximum is reached for deleted files, ownCloud begins to delete files,
-  starting with the oldest versions, until it reaches the memory usage limit again.
-
-You can view all of the deleted files by clicking on the :guilabel:`Deleted
-files` button in Files app on the web interface.
-
-Restoring Files
----------------
-
-To restore a deleted file:
-
-1. In the Files app, click the :guilabel:`Deleted files` button.
-
-   The Files app shows all deleted files.
-
-   .. figure:: ../images/deleted_files.png
-
-       **Deleted files**
-
-2. Hover the cursor over the file that you want to restore.
-
-   Task options appear for the file.
-
-3. Click the :guilabel:`Restore` button.
-
-   The Files app restores the file to its original location on the server.
-
-Deleting Files
---------------
-
-To permanently delete a file:
-
-1. In the Files app, click the :guilabel:`Deleted files` button.
-
-   See the **Deleted files** image above.
-
-2. Hover the cursor over the file that you want to delete.
-
-   Task options appear for the file.
-
-3. Click the :guilabel:`Trash can` button.
-
-   The Files app permanently removes the file from the server.
-
-Modifying the Deleted File Age-Out Value
-----------------------------------------
-
-Each time a file is added to the deleted files directory, ownCloud checks the
-age of the deleted files. By default, deleted files remain in the deleted files
-directory for 180 days.
-
-The administrator can adjust the age-out value in the config.php by setting the
-``trashbin_retention_obligation`` value. Files with ages that exceed this value
-are deleted permanently.
+When you delete a file in ownCloud, 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.
+
+Find your deleted files by clicking on the **Deleted files** 
+button on the Files page of the ownCloud Web interface. You'll have options to 
+either restore or permanently delete files.
+
+Quotas
+------
+
+Deleted files are not counted against your storage quota. Only files that 
+originate with users count against their quotas, not files 
+shared with them that originate from other users. (See :doc:`quota` to learn 
+more about quotas.)
+
+What Happens When Shared Files Are Deleted
+------------------------------------------
+
+Deleting files gets a little complicated when they are shared files, as this 
+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 
+   User2 (recipient)
+4. But User3 will not have a copy of "sub" in her trash bin
+
+When User1 deletes "sub" then it is moved to User1's trash bin. It is 
+deleted from User2 and User3, but not placed in their trash bins.
+
+When you share files, other users may copy, rename, move, and share them with 
+other people, just as they can for any computer files; ownCloud does not have 
+magic powers to prevent this.
+
+How the Deleted Files app Manages Storage Space
+-----------------------------------------------
+
+To ensure that users doesn't run over their storage quotas, the Deleted Files 
+app allocates a maximum of 50% of their currently available free space to 
+deleted files. If your deleted files exceed this limit, ownCloud deletes the 
+oldest files (files with the oldest timestamps from when they were deleted) 
+until it meets the memory usage limit again.
+
+ownCloud checks the age of deleted files every time new files are added to the 
+deleted files. By default, deleted files stay in the trash bin for 180 days. The 
+ownCloud server administrator can adjust this value in the ``config.php`` file 
+by setting the ``trashbin_retention_obligation`` value. Files older than the 
+``trashbin_retention_obligation`` value will be deleted permanently. 
+Additionally, ownCloud calculates the maximum available space every time a new 
+file is added. If the deleted files exceed the new maximum allowed space 
+ownCloud will expire old deleted files until the limit is met once again.
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-doc.git