Merge branch 'master' of https://github.com/owncloud/documentation into alrac2

admin_manual/configuration/configuration-file-sharing.rst

@@ -0,0 +1,78 @@
+File Sharing
+============
+
+ownCloud users can share files with their ownCloud groups and other users on 
+the same ownCloud server, and create public shares for people who are not 
+ownCloud users. You have control of a number of user permissions on file shares:
+
+* Allowing users to share files
+* Allowing users to create public shares
+* Requiring a password on public shares
+* Allowing public uploads to public shares
+* Requiring an expiration date on public share links
+* Allowing resharing
+* Restricting sharing to group members only
+* Allowing email notifications of new public shares
+* Excluding groups from creating shares
+
+You may also allow users to create server-to-server shares (see "Configuring 
+Server-to-Server Sharing" in the Admin manual).
+
+.. note:: The Shared folder has been removed from new installations of ownCloud 7.
+   Shares now appear in the top level of your file tree on your Files page. If you
+   are upgrading from older ownCloud versions you will still have your old Shared 
+   folder, but you can change the default shared folder in ``config.php`` with the
+   ``'share_folder' =>`` directive.
+
+Configure your sharing policy on your Admin page in the Sharing section.
+
+.. figure:: ../images/sharing-admin.png
+
+* Check ``Allow apps to use the Share API`` to enable users to share files. If 
+  this is not checked, no users can create file shares
+* Check ``Allow users to share via link`` to enable creating public shares for  
+  people who are not ownCloud users. This creates a hyperlink, just like a 
+  Web page, so your ownCloud server needs to be accessible to whoever you are 
+  sharing with
+* Check ``Enforce password protection`` to force users to set a password on all 
+  public share links. This does not affect local user and group shares
+* Check ``Allow public uploads`` to allow outside users to upload files to 
+  public shares
+* Checking ``Set default expiration date`` sets a default expiration date on 
+  public shares, and checking ``Enforce expiration date`` makes it a requirement
+* Check ``Allow resharing`` to enable users to re-share files shared with them
+* Check ``Restrict users to only share with users in their groups`` to confine 
+  sharing within group memberships
+* Check ``Allow users to send mail notification for shared files`` so that 
+  users can send email notifications when they create new public shares
+* Check ``Exclude groups from sharing`` to prevent members of specific groups 
+  from creating any file shares in those groups. When you check this, you'll 
+  get a dropdown list of all your groups to choose from. Members of excluded 
+  groups can still receive shares, but not create any
+
+This is how it looks when a user creates a public share with passwords and 
+expiration dates required:
+
+.. figure:: ../images/sharing-user.png
+
+This what a local share looks like. The user creating the share controls 
+re-sharing, editing, updating, and deletion privileges:
+
+.. figure:: ../images/sharing-user-local.png
+
+Creating Persistent File Shares
+-------------------------------
+
+When a user is deleted, their files are also deleted. As you can imagine, this 
+is a problem if they created file shares that need to be preserved, because 
+these disappear as well. In ownCloud files are tied to their owners, so 
+whatever happens to the file owner also happens to the files.
+
+One solution is to create persistent shares for your users. You can retain 
+ownership of them, or you could create a special user for the purpose of 
+establishing permanent file shares. Simply create a shared folder in the usual 
+way, and share it with the users or groups who need to use it. Set the 
+appropriate permissions on it-- at a minumum ``share`` and ``create``-- and then 
+no matter which users come and go, the file shares will remain. Because all 
+files added to the share, or edited in it, automatically become owned by the 
+creator of the share regardless of who adds or edits them.

admin_manual/configuration/configuration_encryption.rst

@@ -25,6 +25,46 @@ encryption keys are stored in following folders:
    `this blog post <https://owncloud.org/blog/how-owncloud-uses-encryption-to-protect-your-data/>`_
    for more details.
 
+Enabling the Encryption App
+---------------------------
+
+Though ownCloud provides the Encryption app in the server download, it is
+disabled by default.  To enable the Encryption app:
+
+1. Access the ownCloud server as administrator.
+
+2. In the Apps Selection Menu, click "+".
+
+   All apps appear in the Apps Information field.
+
+3. Scroll down the apps list and click the Encryption app.
+
+   .. figure:: ../images/encryption_enabling.png
+
+   **Encryption app (Enabling)**
+
+4. Click the :guilabel:`Enable` button.
+
+   The Encryption app is enabled.
+
+Decrypting Encrypted Files
+--------------------------
+
+If the Encryption app is disabled after users have already stored encrypted
+data, users are prompted to decrypt their files again in their personal
+settings. Once done, users can continue to use their ownCloud without
+encryption.
+
+Settings
+--------
+
+Once the encryption app is enabled, additional settings appear on the Admin
+settings page.  These settings include the ability to:
+
+* Set a recovery key password.
+* Enable or disable the use of the recovery key password.
+
+
 Enable File Recovery Feature
 ----------------------------
 
@@ -45,10 +85,10 @@ at the top of the user management settings. After entering the recovery-key
 password the admin can change the user's log-in password which will
 automatically recover the user's file.
 
-If you use a user back-end which doesn't allow you to change the log-in
+If you use a user backend which does not allow you to change the log-in
 password directly within ownCloud, e.g. the LDAP back-end, than you can follow
 the same procedure to recover a user's files. The only difference is that
-you need to change the log-in password additionally at your back-end. In this
+you need to change the log-in password additionally at your backend. In this
 case make sure to use both times the same password.
 
 LDAP and other external user back-ends

admin_manual/configuration/configuration_users.rst

@@ -1,235 +1,147 @@
 User Management
 ===============
 
-ownCloud administrators can easily manage users via the web interface. To go 
-into user management page, click your username on the web interface and select 
-*Users*. A page similar to the image below will be shown:
+In ownCloud 7, the Users management page has been streamlined and improved. You 
+can create new users, view all of your users in a single scrolling window, 
+filter users by group, see what groups they belong to, edit their full names and 
+passwords, see their data storage locations, view and set quotas, and, if you so 
+desire, delete them with a single click.
 
-.. figure:: ../images/oc_admin_user_manage.png
+.. figure:: ../images/users-config.png
 
-  Users management page
+User accounts have the following properties:
 
-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).
+*Login Name (Username)*
+  This is the unique ID of an ownCloud user, and it cannot be changed.
 
 *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.
+  The user's display name that appears on file shares, the ownCloud Web 
+  interface, and emails. Admins and users may change the Full Name anytime. If 
+  the Full Name is not set it defaults to the login name.
 
 *Password*
-  This is the password the user uses to login to ownCloud.
+  The admin sets the new user's first password. Both the user and the admin can 
+  change the user's password at anytime.
 
 *Groups*
-  This is a list of security groups the user is assigned to. By default the
-  user is not member of any user group.
+  You may create groups, and assign group memberships to users. By default new 
+  users are not assigned to any groups.
 
 *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.
+  Group admins are granted administrative privileges on specific groups, and 
+  can add and remove users from their groups.
 
 *Quota*
-  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.
+  The maximum disk space assigned to each user. Any user that exceeds the quota 
+  cannot upload or sync data. ownCloud 7 introduces a new feature, and that is 
+  the option to include external storage in user quotas.
 
-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.
+Creating a New User
+~~~~~~~~~~~~~~~~~~~
 
 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.
+* Enter the new user's **Login Name** and their initial **Password** 
+* Optionally, assign **Groups** memberships
+* Click the **Create** button
 
-   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.
+.. figure:: ../images/users-create.png
 
 Login names may contain letters (a-z, A-Z), numbers (0-9), dashes (-), 
-underscores (_), periods (.) and at signs (@).
+underscores (_), periods (.) and ampersands (@). After creating the user, you 
+may fill in their **Full Name** if it is different than the login name, or 
+leave it for the user to complete.
 
+Remember to give your new users their logins and passwords.
 
-
-Reset a user's password
+Reset a User's Password
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-To reset a user's password:
+You cannot recover a user's password, but you can set a new one:
 
-#. Hover your cursor over 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.
+* Hover your cursor over the user's **Password** field
+* Click on the **pencil icon** 
+* Enter the user's new password in the password field, and remember to provide 
+  the user with their password
 
-Remember to provide the user with the new login information after you have
-reset the password.
+Renaming a User
+~~~~~~~~~~~~~~~
+
+Each ownCloud user has two names: a unique **Login Name** used for 
+authentication, and a **Full Name**, which is their display name. You can edit 
+the display name of a user, but you cannot change the login name of any user.
+
+To set or change a user's display name:
+
+* Hover your cursor over the user's **Full Name** field
+* Click on the **Pencil icon** 
+* Enter the user's new display name
 
 
-Rename a user
-~~~~~~~~~~~~~
+Granting Administrator Privileges to 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.
+ownCloud has two types of administrators: **Super Administrators** and **Group 
+Administrators**. Group administrators have the rights to create, edit and 
+delete users in their assigned groups. Group administrators cannot access 
+system settings, or add or modify users in the groups that they are not **Group 
+Administrators** for. Use the dropdown menus in the **Group Admin** column to 
+assign group admin privileges.
 
-To set a user's display name:
+.. figure:: ../images/users-groups.png
 
-#. Hover your cursor over 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.
+**Super Administrators** have full rights on your ownCloud server, and can 
+access and modify all settings. To assign the **Super Administrators** role to 
+a user, simply add them to the ``admin`` group.
 
 
-Grant administrator privileges to a user
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Managing Groups
+~~~~~~~~~~~~~~~
 
-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*.
+You can assign new users to groups when you create them, and create new groups 
+when you create new users. You may also use the **Add Group** button at the top 
+of the left pane to create new groups. New group members will immediately 
+have access to file shares that belong to their new groups.
 
-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
+Setting Storage Quotas
 ~~~~~~~~~~~~~~~~~~~~~~
 
-To limit a user's storage quota:
+Click the gear on the lower left pane to set a default storage quota. This is 
+automatically applied to new users. You may assign a different quota to any user 
+by selecting from the **Quota** dropdown, selecting either a preset value or 
+entering a custom value. When you create custom quotas, use the normal 
+abbreviations for your storage values such as 500 MB, 5 GB, 5 TB, and so on.
 
-Find the user and select an item from the **Quota** drop-down list.
+You now have a configurable option in ``config.php`` that controls whether 
+external storage is counted against user's quotas. The default is to not count 
+external storage as part of user storage quotas. If you prefer to include it, 
+then change the default ``false`` to ``true``.::
 
-   * 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.
+   'quota_include_external_storage' => false,
 
-If you edit the value of the **Default Quota** field by clicking on the **gear** 
-icon, 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. 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. 
-
-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.
+Metadata takes up about 10% of disk space, but is not counted against user 
+quotas. Users can check their used and available space on their Personal pages.
+Only files that originate with users count against their quotas, and not files
+shared by other users. Deleted files that are still in the trash bin do not
+count against quotas. The trash bin is set at 50% of quota in the 
+``lib/trashbin.php`` file. Deleted file aging is set with 
+``trashbin_retention_obligation`` in ``config.php``, with a default of 30 days.
+When deleted files exceed 50% of quota then the oldest files are removed until
+the total is below 50%. 
 
 
-User Groups
------------
+Deleting users
+~~~~~~~~~~~~~~
 
-Create Group
-~~~~~~~~~~~~
+Deleting a user is easy: hover your cursor over their name on the **Users** page 
+until a trashcan icon appears at the far right. Click the trashcan, and they're 
+gone. You'll see an undo button at the top of the page, which remains until you 
+refresh the page. When the undo button is gone you cannot recover the deleted 
+user.
 
-To create a user group:
-
-#. Click on **Add Group** button on the left side of the user management page.
-#. 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 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.
-
-
-.. note:: If you have direct access to the database, you can manually rename 
-the group from database tables oc_groups and oc_group_user.
+All of the files owned by the user are deleted as well, including all files they 
+have shared. If you need to preserve the user's files and shares, you must first 
+download them from your ownCloud Files page, which compresses them into a zip 
+file, or use a sync client to copy them to your local computer. See the "File 
+Sharing" section of the Admin Manual to learn how to create persistent file 
+shares that survive user deletions.

admin_manual/installation/installation_windows.rst

@@ -240,11 +240,10 @@ To ensure your configuration is correct:
 
 7. Choose the `Request Filtering` feature from the IIS Manager.
 
-8. Ensure that all verbs are permitted (or none are forbidden) in the `Verbs` tab.
+8. Ensure that all verbs are permitted (or none are forbidden) in the `Verbs` tab. You need to allow the verbs ``GET``, ``HEAD``, ``POST``, ``OPTIONS``, ``PROPFIND``, ``PUT``, ``MKCOL``, ``MKCALENDAR``, ``DELETE``, ``COPY`` and MOVE``.
 
     .. note:: Because ownCloud must be able to use WebDAV on the application level, you must also ensure that you do not enable the WebDAV authoring module.
 
-
 Configuring ownCloud, PHP and IIS for Large File Uploads
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

admin_manual/maintenance/restore.rst

@@ -12,7 +12,7 @@ Restore Folders
 
 .. note:: This guide assumes that your previous backup is called "owncloud-dirbkp"
 
-Simply copy your config and data folder (or even your whole ownCloud install and data folder) to a place outside of
+Simply copy your config and data folder (or even your whole ownCloud install and data folder) to 
 your ownCloud environment. You could use this command::
 
     rsync -Aax owncloud-dirbkp/ owncloud/

admin_manual/whats_new_admin.rst

@@ -1,8 +1,8 @@
 What's New for Admins in ownCloud 7
-=================
+===================================
 
 New User Management
-------------------
+-------------------
 
 Admins can now view all ownCloud users in a single scrolling window, filter user 
 lists by group, and search by user display name using the new text filter. User 
@@ -11,7 +11,7 @@ user and the last time they logged in. New groups can be added with a click of
 a button.
 
 External Storage
----------------
+----------------
 
 Major improvements to the external storage app include support for FTP, Dropbox, 
 Google Drive, sFTP, Swift, S3, WebDAV, SMB/CIFS and more storage locations to 
@@ -20,7 +20,7 @@ in their Personal tabs. Further performance improvements have made externally
 mounted storage faster and more responsive.
 
 Server to Server Sharing
-----------------------
+------------------------
 
 ownCloud 7 servers can now connect shares with each other. With just a 
 few clicks you can easily and securely create public shares that are available 
@@ -29,7 +29,7 @@ also create their own public shares.
 
 
 SharePoint Integration (Enterprise Edition only)
-----------------------
+------------------------------------------------
 
 Native SharePoint support has been added to ownCloud 7 Enterprise Edition as a 
 secondary storage location for SharePoint 2007, 2010 and 2013. When this is 
@@ -41,7 +41,7 @@ ownCloud preserves SharePoint ACLs to ensure content is restricted per
 SharePoint rules.
 
 Windows Network Drive Integration (Enterprise Edition only)
---------------------------------
+-----------------------------------------------------------
 
 ownCloud has always supported mounting Windows network drives, and in OC7 EE it 
 is easier than ever for the administrator to mount Windows Network Drives 
@@ -52,7 +52,7 @@ devices and the Windows network drives.
 
 
 Sharing
-------
+-------
 
 Sharing has been dramatically enhanced and streamlined, making it more flexible, 
 faster and accessible. Improvements include:
@@ -71,21 +71,21 @@ faster and accessible. Improvements include:
 
  
 SMTP Configuration Wizard
------------------------
+-------------------------
 
 The new graphical SMTP configuration connects to your mail server in just a few 
 clicks, so that ownCloud can send automated messages to users. ownCloud 
 connects via PHP, Sendmail, or standard SMTP.
 
 Editable email Templates
--------------------
+------------------------
 
 ownCloud admins can now edit the email templates that ownCloud uses for 
 automatic notifications on the Admin page.
 
 
 Active Directory and LDAP Enhancements
-------------------
+--------------------------------------
 
 Several improvements have been made to the LDAP and Active Directory plug-in 
 application, improving both the performance of the application as well as the 

user_manual/files/encryption.rst

@@ -31,44 +31,11 @@ The current version of the Encryption app encrypts all files stored in ownCloud
    `this blog post <https://owncloud.org/blog/how-owncloud-uses-encryption-to-protect-your-data/>`_
    for more details.
 
-Enabling the Encryption App
----------------------------
-
-Though ownCloud provides the Encryption app in the server download, it is
-disabled by default.  To enable the Encryption app:
-
-1. Access the ownCloud server as administrator.
-
-2. In the Apps Selection Menu, click "+".
-
-   All apps appear in the Apps Information field.
-
-3. Scroll down the apps list and click the Encryption app.
-
-   .. figure:: ../images/encryption_enabling.png
-
-   **Encryption app (Enabling)**
-
-4. Click the :guilabel:`Enable` button.
-
-   The Encryption app is enabled.
-
-Decrypting Encrypted Files
---------------------------
-
-If the Encryption app is disabled after users have already stored encrypted
-data, users are prompted to decrypt their files again in their personal
-settings. Once done, users can continue to use their ownCloud without
-encryption.
-
 Settings
 --------
 
-Once the encryption app is enabled, additional settings appear on the Admin
-settings page.  These settings include the ability to:
-
-* Set a recovery key password.
-* Enable or disable the use of the recovery key password.
+If the administrator enabled Encryption app, one or all of the following settings will be
+visible in your personal settings page.
 
 Recovery Key Password
 ~~~~~~~~~~~~~~~~~~~~~

user_manual/files/filesweb.rst

@@ -1,25 +1,32 @@
 Accessing your Files Using the Web Interface
 ============================================
 
-You can access your ownCloud files from anywhere using the ownCloud web
-interface. Once accessed, using the Files app you can view (if a common type),
-move, rename, download, share, and delete your files easily.
+You can access your ownCloud files with the ownCloud web interface and create, 
+preview, edit, delete, share, and re-share files. Your ownCloud administrator 
+has the option to disable these features, so if any of them are missing on your 
+system ask your server administrator.
 
-.. figure:: ../images/oc_filesweb.png
+.. figure:: ../images/users-files.png
 
     **ownCloud web interface Files app**
 
 ownCloud version 7 enables you to see file thumbnails next to the filenames.
-Hovering over a file or folder provides the following highlighted list of
-operations:
+Hovering over a file or folder provides the following operations:
 
 * :guilabel:`Pencil icon` -- Enables you to rename a file or folder.
 * :guilabel:`Download` -- Downloads a file to your system.
-* :guilabel:`Versions` (when enabled; See :doc:`versioncontrol` for details) -- Enables you to revert the file or folder to any available older versions.
-* :guilabel:`Share` -- Enables you to share the file or folder with a group or a specific user.  Also enables you to share using a specified link.
-* :guilabel:`Edit` -- When a file is editable, enables you to open the file in the document application as long as that application is enabled for use from the ownCloud server.
+* :guilabel:`Versions` -- Enables you to revert the file or folder to any 
+   available older versions.
+* :guilabel:`Share` -- Enables you to share the file or folder with a group or a 
+   specific user.  Also enables you to create a public share with a hyperlink.
+* :guilabel:`Edit` -- Edit the file in ownCloud.
 * :guilabel:`Trash icon` -- Deletes the selected file or folder.
 
+.. Note:: The Shared folder has been removed from new installations of ownCloud 7.
+   Shares now appear in the top level of your file tree on your Files page. If you
+   are upgrading from older ownCloud versions you will still have your old Shared 
+   folder. Your server administrator has the option to change this in the server's
+   ``config.php`` file with the ``'share_folder' =>`` directive.
 
 Navigating Inside Your ownCloud
 -------------------------------
@@ -50,9 +57,11 @@ folder by clicking on the *New* button in the Files app.
 
 The *New* button provides the following three options from which to choose:
 
-* *Text file* -- Creates a simple text file and adds the file to the current folder in your ownCloud.
+* *Text file* -- Creates a simple text file and adds the file to the current 
+   folder in your ownCloud.
 * *Folder* -- Creates a new folder in the current folder.
-* *From link* -- Downloads a file from a provided link path and places it into the current folder.
+* *From link* -- Downloads a file from a provided link path and places it into 
+   the current folder.
 
 
 Selecting Files or Folders
@@ -75,17 +84,23 @@ the top right side of the Files app field.
 Filtering the File Application View
 -----------------------------------
 
-ownCloud enables you to view files in the File Application View using filter options located in the Apps Information Field. This feature enables you to quickly and easily view and manage files based on their share status.
+ownCloud enables you to view files in the File Application View using filter 
+options located in the Apps Information Field. This feature enables you to 
+quickly and easily view and manage files based on their share status.
 
 You can click on any of the filter options to view the files as follows:
 
-* ``All files`` -- The default view; displays all files in the Application View window.
+* ``All files`` -- The default view; displays all files in the Application View 
+   window.
 
-* ``Shared with you`` -- Displays all files shared with you by another user or group.
+* ``Shared with you`` -- Displays all files shared with you by another user or 
+   group.
 
-* ``Shared with others`` -- Displays all files that you have shared with other users or groups.
+* ``Shared with others`` -- Displays all files that you have shared with other 
+    users or groups.
 
-* ``Shared by link`` -- Displays all files that are shared by you through the use of a link.
+* ``Shared by link`` -- Displays all files that are shared by you through the 
+    use of a link.
 
 Previewing Files
 ----------------
@@ -103,51 +118,49 @@ and dropping them into any directory. If you want to move a file or folder to
 an upper directory, click and drag them to one of the folders shown in the
 navigation bar.
 
-Sharing Files
--------------
+Sharing Files Locally
+---------------------
 
-When enabled by the administrator, you can share any file or folder on ownCloud
- with a local user, group, or any person online with a public link. By sharing a
- file or folder, the user or group can download the information directly to their
- system. Shared files and folders depict a globe icon and the status *Shared* in
- the file or folder row.
+When enabled by your administrator, you can share files or folders on ownCloud 
+with a local user, group, or any person online with a public link. Shared files 
+and folders are labeled with the triangular share icon, and the status *Shared* 
+in the file or folder row.
 
-To share a file or folder:
+To create a local share with other users or groups on your ownCloud server:
 
-1. Using your cursor, hover over an item in the Files Application View.
+1. Hover your cursor over an item on the Files page
+2. Click the **Share** icon
 
-2. Locate the **Share** icon in the file or folder row.
+The Share dialog box opens to show the following options:
 
-3. Click *Share*.
+.. figure:: ../images/users-share-local.png
+  
+Type the name of the user or group that you want to share with. If you want to 
+share with more than one, you have to create each share separately. Check the 
+permissions you want the user or group to have, and optionally send them an 
+email notification. 
 
-  The Share dialog box opens to show the following options:
+.. note:: Users must enter their email addresses on their Personal pages for 
+   email notifications to work
+   
+Your new share appears on user's Files pages marked with a Share icon, and the 
+name of the file owner.
 
-  .. figure:: ../images/oc_files_share.png
+.. figure:: ../images/users-share-local2.png
+    
+When you want to revoke a share, simply click the Trashcan icon next to the 
+name of the appropriate user or group in the Shared dialog.    
+    
+Creating a Public Share
+-----------------------
 
-    **Share dialog box**
+You can share files outside of your organization with people who are not users 
+on your ownCloud server by creating a public share link. Open the Share dialog 
+and check Share Link.
 
-4. Choose the desired share option:
-
-  * **User/Group Share** field: Enables you to specify to whom you want to share the file or folder. Once you specify a user or group, a dialog appears providing added sharing options.
-
-	  .. figure:: ../images/oc_share_with_options.png
-
-		**Sharing options dialog**
-
-  * **Share link** checkbox: When enabled (checked), provides the following additional share options:
-
-	- **File/Folder URL** field: Specifies the URL to the folder or file that you want to share.
-
-	- **Password Protect** checkbox: When enabled (checked), provides the option of protecting access to the file of folder through the use of a simple alphanumeric password.
-
-	- **Allow Public Upload** checkbox: When enabled (checked), provides the ability for shared users to upload files using the provided link.
-
-	- **Email Link** field: Enables you to alert users of the shared folder by email.  You can specify one or more email addresses in this field (separated by spaces) and then click the "Send" button to send emails of the share.
-
-		.. note:: The server must be configured with a mail server or mail server access.
-
-  * **Set expiration date** checkbox: When enabled (checked), you can specify a date for which the share expires. You specify the expiration date in the format MM/DD/YYYY. For added convenience, clicking in the "Expiration date" field opens a calendar from which you can specify the date.
-
-    .. figure:: ../images/oc_share_expiration_calendar.png
-
-	**Expiration Date Calendar**
+.. figure:: ../images/users-share-public.png
+    
+This creates a public URL that anyone can use to access the share. You have the 
+options to send an email notification, protect it with a password, and put an 
+expiration date on it. Your ownCloud administrator has the option to require 
+passwords and expiration dates.  

user_manual/webinterface.rst

@@ -33,7 +33,6 @@ To access the ownCloud web interface:
    The ownCloud main interface opens.
 
    .. figure:: images/oc_main_web.png
-      :scale: 90%
 
    **ownCloud main user interface**
 
@@ -45,7 +44,6 @@ Once you have accessed the ownCloud Server main web interface you can add files,
 (if you are administering the server) or by your server administrator.
 
 .. figure:: images/oc_main_web_labelled.png
-   :scale: 90%
 
 **Navigating the main user interface**
 

user_manual/whats_new.rst

@@ -1,8 +1,8 @@
 What's New for Users in ownCloud 7
-=================
+==================================
 
 No More Shared Folder
-------------------------------
+---------------------
 
 The Shared folder has been removed from ownCloud 7. If you are upgrading 
 from older ownCloud versions you will still have your old Shared folder, 
@@ -11,28 +11,29 @@ folder is no longer required. You can now create your own folders for
 storing shared files, and organize and move them around like any other files.
 
 Selective Sync
----------
+--------------
+
 The desktop client now makes it easier for users to configure which folders 
 on their ownCloud instances should be syncing with the desktop, and can easily 
 make changes for special circumstances such as travel and special projects.
 
 
 Server to Server Sharing
-----------------------
+------------------------
 
 ownCloud 7 servers can now connect shares directly with each other. With just a 
 few clicks you can easily and securely connect to public shares on other 
 ownCloud servers, and optionally create public shares for sharing your own files 
-if your admin allows it. 
+if your admin allows it.
 
 File and Activity Notifications
-------------------
+-------------------------------
 
 In ownCloud 7 you can set up automatic notifications of tracked 
 activities such as new shares, and changed or deleted files.
 
 ownCloud Documents with Word Conversion
--------------------------------
+---------------------------------------
 
 You can convert Word documents on the fly: open them in ownCloud for 
 editing, and live editing with other users, and when you close it reverts 
@@ -40,11 +41,11 @@ to its original Word format with all of your changes embedded.
 
 
 Mobile Web Browser Support
----------------
+--------------------------
 
 ownCloud 7 is friendly to small screens, and can be used on most tablet and 
 mobile browsers without requiring the use of a native mobile app. This provides 
-support for devices that don't have a native app, like Microsoft and 
+support for devices that do not have a native app, like Microsoft and
 Blackberry.
 
 Lazy Loading Files
@@ -55,10 +56,9 @@ files as you scroll down the page instead of loading all of them when you open
 the page.
 
 Object Stores as Primary Storage
----------------------------
+--------------------------------
 
 ownCloud can now leverage SWIFT object stores as primary storage for ownCloud 
 files. Users can choose the best option for their specific needs: local 
-storage, 
-network filesystem mounts, or SWIFT object stores.
+storage, network filesystem mounts, or SWIFT object stores.