[Pkg-owncloud-commits] [owncloud-doc] 13/227: Update configuration_users.rst

[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 6dd6fa4f15a2c1c3417135d996e9637112847d40
Author: Carla Schroder <carla at owncloud.com>
Date:   Sun Aug 24 16:40:22 2014 -0700

    Update configuration_users.rst
---
 admin_manual/configuration/configuration_users.rst | 34 ++++++----------------
 1 file changed, 9 insertions(+), 25 deletions(-)

diff --git a/admin_manual/configuration/configuration_users.rst b/admin_manual/configuration/configuration_users.rst
index c630089..d1eb93b 100644
--- a/admin_manual/configuration/configuration_users.rst
+++ b/admin_manual/configuration/configuration_users.rst
@@ -186,12 +186,11 @@ Delete User
 * The user will no longer be able to sign in to your ownCloud installation.
 * You cannot revert the deletion or restore a deleted account.
 
-.. note:: If this user had a share with a group or user, the share also will
-<<<<<<< HEAD
-          be deleted permanently. If you need to preserve the share, copy it to 
-the account of a user that won't be deleted, for example the admin user, or a 
-special permanent user account created for persistent shares. You can copy the 
-share using your normal file management tools: the Web GUI, via WebDAV, or sync 
+.. note:: If this user had a share with a group or user, the share also will be 
+deleted permanently. If you need to preserve the share, copy it to the account 
+of a user that won't be deleted, for example the admin user, or a special 
+permanent user account created for persistent shares. You can copy the share 
+using your normal file management tools: the Web GUI, via WebDAV, or sync 
 client. Then you'll need to re-share it. The quickest way to find out which 
 groups and users it was originally shared with is to log in to the user's 
 account and click the Shared button of the share. 
@@ -201,21 +200,10 @@ To delete a user account:
 #. Hover your cursor over line of the user you want to delete.
 #. Click the **trashcan icon** at the end of the line.
 
-.. note:: If you accidentally delete a user, you can use undo button shown on
-          notification bar at the top of the page, which will remain until you 
-leave or refresh the page. After refreshing the page, the undo button disappears 
-and you cannot recover the user account.
-=======
-          be deleted permanently. If you need to preserve the share, copy it to the account of a user that won't be deleted, for example the admin user, or create a special permanent user for creating persistent shares.
-
-To delete a user account:
-
-#. Hover the line of the user you want to delete.
-#. Click the **trashcan icon** at the end of the line.
-
-.. note:: If you accidentally delete a user, you can use undo button shown on
-          notification bar at the top of the page, which will remain until you leave or refresh the page. After refreshing the page, the undo button disappears and you cannot recover the user account.
->>>>>>> 23456c8... Corrections and updates re deleting users and groups, and how to create persistent shares that survive when users are deleted
+.. note:: If you accidentally delete a user, you can use undo button shown on 
+notification bar at the top of the page, which will remain until you leave or 
+refresh the page. After refreshing the page, the undo button disappears and you 
+cannot recover the user account.
 
 
 User Groups
@@ -237,15 +225,11 @@ group drop-down list.
 Edit/Delete Group
 ~~~~~~~~~~~~~~~~~
 
-<<<<<<< HEAD
 Currently, groups cannot be renamed. This feature will be available in a future 
 version of ownCloud. To delete a group, click on the trash icon next to the 
 group name on the left pane. The group assignment will be automatically removed 
 from all group members.
 
-=======
-Currently, groups cannot be renamed. This feature will be available in a future version of ownCloud. To delete a group, click on the trash icon next to the group name on the left pane. The group assignment will be automatically removed from all group users.
->>>>>>> 23456c8... Corrections and updates re deleting users and groups, and how to create persistent shares that survive when users are deleted
 
 .. note:: If you have direct access to the database, you can manually rename 
 the group from database tables oc_groups and oc_group_user.

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