Merge pull request #222 from wakeup/stable6

Add user_management and update app configuration pages

admin_manual/configuration/configuration_apps.rst

@@ -3,8 +3,22 @@ Apps Configuration
 After you have installed ownCloud you might realize that it would be nice to
 provide an additional function on top of the core functionality in your ownCloud installation.
 
-The first step should be to check out the `ownCloud apps store <http://apps.owncloud.com/>`_. There you will find a
-lot of ready-to-use apps provided by the ownCloud community.
+With ownCloud installation, you will find some apps enabled by default. To see which applications
+are enabled, click on Apps button on web interface navigation to go into applications page:
+
+.. figure:: ../images/oc_admin_app_page.png
+Administrator application page
+
+In this page, you can enable or disable applications simply by clicking on their names.
+Enabled applications will be shown in **bold**, while disabled ones will be shown in normal font.
+If the app is not developed by ownCloud, it will have the *3rd party* notice next to it. To see what an
+application does, clicking on its name will show a description on the right side of the same page.
+
+To install new apps, you can use *More apps* button or check out the `ownCloud apps store <http://apps.owncloud.com/>`_.
+There you will find a lot of ready-to-use apps provided by the ownCloud community.
+
+If you would like to add your own app, please use *Add your App...* button on the same page. This will redirect you to
+our `Developer Center <http://owncloud.org/dev>`_.
 
 Parameters
 ----------

admin_manual/configuration/configuration_users.rst

@@ -0,0 +1,224 @@
+User Management
+===============
+
+ownCloud administrators can easily manage users via web interface. To go into
+user management page, click your username on web interface and select *Users*.
+A page similar to the image below will be shown:
+
+.. figure:: ../images/oc_admin_user_manage.png
+Users management page
+
+A fictive use case will help you understand the concept of users, user groups
+and group admins.
+
+Think of a small, 25-member staff company, named "Cloud Lovers", that is lead
+by its founder Richard. In this company Bob acts as IT operator and recently
+set up ownCloud. Being the installing user, Bob is member of the so called
+"admin" user group of ownCloud. His colleague Tom, who provides support if Bob
+is on holiday, is member of the "admin" user group as well. All employees,
+including Bob and Tom, are members of the user group "Internal", that is used
+to share data across the company. Mostly for operational data, that should not
+be accessible to all employees, Bob created the "Administration" user group
+having two members: Richard and his assistant Susan. Richard is group admin of
+this user group, so he can manage the members of the "Administration" user
+group on his own.
+
+
+Users
+-----
+
+A user represents an account of the ownCloud installation. In this section the
+core properties are listed.
+
+*Login name (Username)*
+  This is the unique ID of a ownCloud user (e.g. test, jon.doe).
+
+*Full Name*
+  This is the name that is used all over the user interface to identify the
+  user i.e. when sharing data or sending mails. If no display name is set, it
+  defaults to the login name.
+
+*Password*
+  This is the password the user uses to login to ownCloud.
+
+*Groups*
+  This is a list of security groups the user is assigned to. By default the
+  user is not member of any user group.
+
+*Group Admin*
+  This is a list of security groups the user has administration privileges for.
+  By default the user is not registered as group admin for any user group.
+
+*Storage*
+  This is the maximum disk space that may be used by the user. If the user
+  reaches this limit he/she is not able to upload or sync further data. The
+  storage quota is specified in the format *Number Unit* (e.g. 100 B (byte),
+  50 KB (kilobyte), 20 MB (megabyte), 5 GB (gigabyte)). If no unit is given,
+  the number is interpreted as bytes.
+
+Each user is able to change its display name and password.
+
+
+Create a user
+~~~~~~~~~~~~~
+
+Before users can sign in and share data, they need ownCloud user accounts.
+
+To create a user account:
+
+#. Enter the new user's **Login Name** and its initial **Password** in the
+   appropriate fields.
+#. (Optional) Select the **Groups** to which you want to assign the new user.
+#. Click **Create**.
+#. (Optional) Edit additional user settings.
+
+   To set other user settings, such as setting a display name or limiting the
+   user's storage, see instructions as follows.
+
+Created users will have the storage specified on *Default Storage* setting
+on the same page.
+
+Login names may contain letters (a-z, A-Z), numbers (0-9), dashes (-),
+underscores (_), periods (.) and at signs (@).
+
+
+
+Reset a user's password
+~~~~~~~~~~~~~~~~~~~~~~~
+
+To reset a user's password:
+
+#. Hover the line of the user.
+#. Click on the **pencil icon** next to the password field.
+#. Enter the user's new password in the password field and then hit the
+   **Enter** key of your keyboard.
+
+Remember to provide the user with the new login information after you have
+reset the password.
+
+
+Rename a user
+~~~~~~~~~~~~~
+
+Each ownCloud user has two names: an unique *login name* used for
+authentication, and a *display name* (e.g. the user's first name and last name)
+used in the user interface. You can edit the display name of a user, but you
+cannot change the login name of any user.
+
+To set a user's display name:
+
+#. Hover the line of the user.
+#. Click on the **pencil icon** next to the display name field.
+#. Enter the user's new display name in the corresponding field and then hit
+   the **Enter** key of your keyboard.
+
+
+Grant administrator privileges to a user
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If a user has administrator privileges, the user has the right to manage other
+users. Within ownCloud there are two types of administrators: *Super
+Administrators* and *Group Administrators*.
+
+Group administrators have the management rights to:
+
+* Create new users and assign them to the group of the group administrator
+* Edit and delete users that are assigned to the group of the group
+  administrator
+
+Group administrators cannot access system settings or modify installation-wide
+configuration like the default storage.
+
+To assign the *super administrator* role to a user:
+
+#. Use the drop-down list in *Groups* column of the user
+#. Assign the user to the "admin" user group
+
+To assign the *group administrator* role to a user:
+
+Find the user and select the user groups from the **Group Admin** drop-down
+list you want the user become group administrator for.
+
+
+Assign a user to a user group
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To assign a user to a user group:
+
+Find the user and select the user groups from the **Groups** drop-down list
+you want to assign the user to. You can use *add group* link to create a new
+group to assign the user to. You can assign the user more than one group by checking
+multiple groups.
+
+
+.. note:: If a file/folder is shared with a group, newly created users will immediately
+          have access to the share.
+
+.. note:: If you assign a user to the *admin* user group, the user will become a
+          *Super Administrator* with unlimited privileges.
+
+
+Limit a user's storage
+~~~~~~~~~~~~~~~~~~~~~~
+
+To limit a user's storage quota:
+
+Find the user and select an item from the **Storage** drop-down list.
+
+   * If you select *Default*, the default storage limit, specified in the
+     action bar at the top, is applied.
+   * If you select *Unlimited*, the user is not limited until the total disk
+     space is consumed.
+   * If you want to enter a custom limit, select *Other...*, enter the storage
+     quota of your choice and hit the **Enter** key of your keyboard.
+
+If you edit the value of the **Default Storage** field in the action bar, all
+users with storage *Default* are affected by this change, i.e. changing the
+default storage from *Unlimited* to *1 GB* will cause all users with *Default*
+storage being limited to 1 GB storage each.
+
+Delete User
+~~~~~~~~~~~
+
+**Important considerations before deleting a 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
+          be deleted permanently.
+
+To delete a user account:
+
+#. Hover the line of the user you want to delete.
+#. Click the **cross 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.
+
+
+User Groups
+-----------
+
+Create Group
+~~~~~~~~~~~~
+
+To create a user group:
+
+#. Open the **Groups** drop-down list in the action bar.
+#. Click **add group**.
+#. Enter the name of the new group and then hit the **Enter** key of your
+   keyboard.
+
+You can *assign users* to the newly created user groups anytime by using users'
+group drop-down list.
+
+
+Edit/Delete Group
+~~~~~~~~~~~~~~~~~
+
+Currently, groups cannot be edited (e.g. renamed) or removed. This feature
+will be available in a future version of ownCloud.
+
+.. note:: If you have direct access to the database, you can manually delete the group
+          from database tables oc_groups and oc_group_user.

admin_manual/configuration/index.rst

@@ -5,10 +5,11 @@ Configuration
 .. toctree::
    :maxdepth: 1
 
+   configuration_apps
+   configuration_users
    auth_ldap
    background_jobs
    configuration_3rdparty
-   configuration_apps
    configuration_automation
    configuration_custom_clients
    configuration_database

admin_manual/index.rst

@@ -50,6 +50,8 @@ Configuration
 =============
 This chapter covers ownCloud and web server configuration.
 
+* :doc:`configuration/configuration_apps`
+* :doc:`configuration/configuration_users`
 * :doc:`configuration/configuration_database`
 * :doc:`configuration/auth_ldap`
 * :doc:`configuration/custom_mount_config_gui`
@@ -59,7 +61,6 @@ This chapter covers ownCloud and web server configuration.
 * :doc:`configuration/configuration_automation`
 * :doc:`configuration/configuration_encryption`
 * :doc:`configuration/configuring_big_file_upload`
-* :doc:`configuration/configuration_apps`
 * :doc:`configuration/configuration_reverseproxy`
 * :doc:`configuration/xsendfile`
 * :doc:`configuration/configuration_3rdparty`

admin_manual/maintenance/backup.rst

@@ -1,4 +1,4 @@
-Backing Up ownCloud
+Backing up ownCloud
 ===================
 
 To backup an ownCloud installation there are three main things you need to retain:

user_manual/files/filesweb.rst

@@ -12,13 +12,38 @@ With ownCloud 6, you can now see file thumbnails next to the filenames. By hover
 will be provided with some file operations. You can use rename, download, share buttons to perform those actions
 or click on the cross icon at the rightmost location to remove the hovered file.
 
+Navigating inside your ownCloud
+-------------------------------
+
+To navigate through folders in your ownCloud, you can simply click on a folder name. The navigation bar
+will show your current directory:
+
+.. figure:: ../images/oc_filesweb_navigate.png
+Navigation bar
+
+You can click on one of the upper directories to navigate up or use home icon to navigate into your root
+folder.
+
+
+Creating/uploading files
+------------------------
+
+You can create files by simply clicking on *New* button on files app. The *New* button will provide three
+options to choose from:
+
+.. figure:: ../images/oc_filesweb_new.png
+New button options
+
+* *Text file* will create a simple text file and add into the current folder in your ownCloud.
+* *Folder* will create a folder in current folder.
+* *From link* will download the file from the provided link and place in the current folder.
 
 
 Selecting files
 ---------------
 
 You can select one or more files by clicking on small thumbnails or icons of the files. To select all files in
-the current directory, use the checkbox under New button.
+the current directory, use the checkbox just above the first file/folder on the list.
 
 If you select multiple files, selected files can be deleted or downloaded as ZIP by using the buttons just above of the file list.
 If download button is not visible, this means that administrator had disabled this feature.
@@ -48,3 +73,7 @@ Share dialog
   the provided link. This is very useful to collect files from multiple users into same place easily.
 * If your server is configured with a mail server, you can type e-mail addresses seperated with space to send the link to multiple users.
 * Finally, setting an expiration date will expiry the share after the specified date.
+
+If you type a user and/or group to the *share with* field, you will be given extra sharing options such as informing via e-mail,
+letting users edit (create, update, delete, re-share) the share. To revoke permissions from users, simply click on cross icon
+on the same line with the users.

user_manual/webinterface.rst

@@ -41,7 +41,8 @@ The web interface comprises of the following items:
 3. **New/Upload button**: This allows you to create new files or upload
    existing ones from your device. Note that you can also drop files from
    Explorer or Finder onto the ownCloud file view and they will get uploaded to
-   ownCloud.
+   ownCloud. With *New* button, you can create a text file, folder or download
+   a file from the provided URL.
 4. **Search/Settings**: Search allows you to look for files and
    directories. Currently, ownCloud provides a full text search. If full text seach does
    not work, administrators need to enable this app from app settings.