[Pkg-owncloud-commits] [owncloud-doc] 175/270: Merge changes from Mark

David Prévot taffit at moszumanska.debian.org
Thu Jul 31 03:53:23 UTC 2014


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

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

commit eccf955a0674d6160ec86a5ace7d911861c83515
Author: Daniel Molkentin <daniel at molkentin.de>
Date:   Wed Jun 25 20:03:27 2014 +0200

    Merge changes from Mark
---
 user_manual/bookmarks.rst                          |   2 +-
 user_manual/conf.py                                |   3 +
 user_manual/files/deletedfiles.rst                 |  34 +--
 user_manual/files/files.rst                        | 312 ++++++++++++---------
 user_manual/files/filesweb.rst                     | 148 ++++++----
 user_manual/files/quota.rst                        |  95 +++++--
 user_manual/files/sync.rst                         |   2 +-
 user_manual/images/Thumbs.db                       | Bin 0 -> 845312 bytes
 user_manual/images/calendar_createevent.png        | Bin 13663 -> 17972 bytes
 user_manual/images/calendar_export.png             | Bin 9835 -> 18885 bytes
 user_manual/images/calendar_import.png             | Bin 9074 -> 8250 bytes
 user_manual/images/calendar_manage-calendars.png   | Bin 34730 -> 39313 bytes
 user_manual/images/calendar_newtimezone1.png       | Bin 4868 -> 5253 bytes
 user_manual/images/contact_crop.jpg                | Bin 22353 -> 50676 bytes
 user_manual/images/contact_emptycontact.png        | Bin 11879 -> 19910 bytes
 user_manual/images/contact_picture.jpg             | Bin 5766 -> 7128 bytes
 user_manual/images/files_versioning.png            | Bin 8557 -> 9333 bytes
 user_manual/images/oc_apps_dropdown.png            | Bin 0 -> 29080 bytes
 user_manual/images/oc_connect.png                  | Bin 63833 -> 107250 bytes
 user_manual/images/oc_documents.png                | Bin 5995 -> 33956 bytes
 user_manual/images/oc_filesweb.png                 | Bin 17316 -> 28666 bytes
 user_manual/images/oc_main_web.png                 | Bin 0 -> 115762 bytes
 user_manual/images/oc_main_web_labelled.png        | Bin 0 -> 150798 bytes
 user_manual/images/oc_main_web_labelled.snag       | Bin 0 -> 147480 bytes
 .../images/oc_personal_settings_dropdown.png       | Bin 0 -> 14895 bytes
 .../images/oc_personal_settings_dropdown.snag      | Bin 0 -> 36888 bytes
 user_manual/images/oc_personal_settings_window.png | Bin 0 -> 119355 bytes
 .../images/oc_personal_settings_window.snag        | Bin 0 -> 143384 bytes
 .../images/oc_share_expiration_calendar.png        | Bin 0 -> 12932 bytes
 user_manual/images/oc_share_with_options.png       | Bin 0 -> 7839 bytes
 user_manual/images/oc_ui.png                       | Bin 45502 -> 138786 bytes
 user_manual/images/owncloud_webinterface.kra       | Bin 127433 -> 387738 bytes
 user_manual/images/owncloud_webinterface_map.png   | Bin 12274 -> 14230 bytes
 user_manual/index.rst                              |  74 +++--
 user_manual/pim/calendar.rst                       | 215 ++++----------
 user_manual/pim/contacts.rst                       |  54 ++--
 user_manual/pim/sync_kde.rst                       |   6 +-
 user_manual/pim/troubleshooting.rst                |  50 ++++
 user_manual/webinterface.rst                       | 166 +++++++----
 39 files changed, 677 insertions(+), 484 deletions(-)

diff --git a/user_manual/bookmarks.rst b/user_manual/bookmarks.rst
index 36ce86e..1425b7a 100644
--- a/user_manual/bookmarks.rst
+++ b/user_manual/bookmarks.rst
@@ -52,7 +52,7 @@ The Bookmarklet
 	Bookmarklet link
 
 The creator of this app understands that people won't want to
-open the ownCloud bookmarks page to add a bookmark every time they see a cool site.
+open the ownCloud boorkmarks page to add a bookmark every time they see a cool site.
 This is why they have made this cool "bookmarklet".
 
 A bookmarklet is small button that you can drag and drop in your bookmarks.
diff --git a/user_manual/conf.py b/user_manual/conf.py
index 885ac6e..84c3d6e 100644
--- a/user_manual/conf.py
+++ b/user_manual/conf.py
@@ -291,3 +291,6 @@ epub_copyright = u'2012-2014, The ownCloud developers'
 
 # Include todos?
 todo_include_todos = True
+
+# substitutions go here
+rst_epilog =  '.. |version| replace:: %s' % version
diff --git a/user_manual/files/deletedfiles.rst b/user_manual/files/deletedfiles.rst
index 669d4de..9d0dcd6 100644
--- a/user_manual/files/deletedfiles.rst
+++ b/user_manual/files/deletedfiles.rst
@@ -1,22 +1,22 @@
 Deleted Files
 =============
 
-ownCloud keeps a copy of your deleted files in case you need them again. To
-make sure that the user doesn't run out of memory, the deleted files app
-manages the size of the deleted files for the user. The app takes care to never
-use more that 50% of your currently available free space. If your deleted files
-exceed this limit, ownCloud deletes the oldest versions until it meets the memory
-usage limit again.
+ownCloud maintains a copy of deleted files in case you need them again. To
+ensure that the user does not run out of memory, the deleted files app manages
+the size of the deleted files for the user. The app takes care to never use
+more that 50% of your currently available free space. If your deleted files
+exceed this limit, ownCloud deletes the oldest versions until it meets the
+memory usage limit again.
 
-Deleted files can be found by clicking on the *Deleted files* link on the left of
-files app section of the web interface.
-You can either restore or permanently delete using appropriate buttons.
+Deleted files can be found by clicking on the :guilabel:`Deleted files` button
+on files app of web interface. You can either restore or permanently delete
+using appropriate buttons.
 
-ownCloud also 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 Administrator can adjust this value in the config.php by setting the
-***"trashbin_retention_obligation"*** value. Files older than the 
-***"trashbin_retention_obligation"*** 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.
+ownCloud also 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 Administrator can adjust this value in the config.php by setting the
+``trashbin_retention_obligation`` value. Files older than the
+``trashbin_retention_obligation`` 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.
diff --git a/user_manual/files/files.rst b/user_manual/files/files.rst
index c4a9dde..af44538 100644
--- a/user_manual/files/files.rst
+++ b/user_manual/files/files.rst
@@ -1,86 +1,99 @@
-Accessing your Files (WebDAV)
-=============================
+Accessing Files Using WebDAV
+============================
 
-Your ownCloud instance can be accessed on every platform via the web interface. There are also options to integrate it with your desktop.
+Web Distributed Authoring and Versioning (WebDAV) is a Hypertext Transfer
+Protocol (HTTP) extension that facilitates collaboration between users in
+editing and managing documents and files stored on web servers. Using WebDAV,
+you can access your ownCloud instance on every platform using the web
+interface. You can also optionally integrate your ownCloud access with your
+desktop.
 
-.. note:: You will have to adjust **example.org/** to the URL of your ownCloud server installation
+.. note:: In the following examples, You must adjust **example.org/** to the
+   URL of your ownCloud server installation.
 
+Accessing Files Using Linux
+---------------------------
 
-Linux
------
+You can access files in Linux operating systems using the following methods:
 
-Gnome 3/Nautilus
-~~~~~~~~~~~~~~~~
 
-The URL that you have to use to connect to the ownCloud installation in nautilus is::
+Accessing Files with Gnome 3 and Nautilus File Manager
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The URL that you have to use to connect to the ownCloud installation using
+Nautilus File Manager is::
 
   davs://example.org/owncloud/remote.php/webdav
 
+.. note:: If your server connection is not HTTPS-secured, use `dav://` instead of `davs://`.
 
 .. image:: ../images/gnome3_nautilus_webdav.png
-   :scale: 75%
 
-If your server connection is not HTTPS-secured, use `dav://` instead of `davs://` .
 
-KDE/Dolphin
-~~~~~~~~~~~
+Accessing Files with KDE and Dolphin File Manager
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To access Files using KDE:
+
 Click in the address area and enter::
 
     webdav://example.org/owncloud/remote.php/webdav
 
 .. image:: ../images/dolphin_webdav.png
 
-or:
+To access files using Dolphin File Manager:
 
-1. Open Dolphin and click on where it says Network in the left hand Places column.
+1. Open Dolphin and click "Network" in the left hand "Places" column.
 2. Click on the icon labeled **Add a Network Folder**.
-3. It should come up with WebDAV already selected. Make sure it is and then click **Next**.
-4. Enter the following settings:
-
-* Name: The name you’ll see in the **Places** bookmark, for example ownCloud
-* User: Your ownCloud username you use to log in, for example admin
-* Server: Your ownCloud domain name, for example **example.org** (without **http://** before or directories afterwards).
-* Folder: Enter::
+   The resulting dialog should appear with WebDAV already selected.
+3. If WebDav is not selected, select it.
+4. Click **Next**.
+5. Enter the following settings:
+   * Name: The name you want to see in the **Places** bookmark, for example ownCloud.
+   * User: The ownCloud username you used to log in, for example admin.
+   * Server: The ownCloud domain name, for example **example.org** (without **http://** before or directories afterwards).
+   * Folder -- Enter the path ``owncloud/remote.php/webdav``.
+6. (Optional) Check the "Create icon checkbox" for a bookmark to appear in the Places column.
+7. (Optional) Provide any special settings or an SSL certificate in the "Port & Encrypted" checkbox.
 
-        owncloud/remote.php/webdav
+Mounting the File System and Accessing with a Command Line
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-5. Create icon checkbox: Tick to get a bookmark in the Places column
-6. Port & Encrypted checkbox: Leave as it is unless you have special settings or an SSL certificate.
+To mount the file system and access files using a command line:
 
-Mounting from command line
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-1. Install the WebDAV support using the *davfs* package. On Debian/Ubuntu, you can use::
+1. Install the WebDAV support using the davfs package. For example, on Debian/Ubuntu, you can use::
 
-	sudo apt-get install davfs2
+  sudo apt-get install davfs2
 
 2. Reconfigure davfs2 to allow access to normal users (select Yes when prompted)::
 
-        sudo dpkg-reconfigure davfs2
+  sudo dpkg-reconfigure davfs2
 
-3. Add the users you want to be able to mount the share to the *davfs2* group::
+3. Specify any users that you want to have mount and share privileges in the davfs2 group::
 
-        sudo usermod -aG davfs2 <user>
+  sudo usermod -aG davfs2 <user>
 
-4. Edit :file:`/etc/fstab` and add the following line for each user who wants to mount the folder (with your details where appropriate)::
+4. Edit the :file:`/etc/fstab` file and add the following line for each user for whom you want to give mount privileges for the folder::
 
-        example.org/owncloud/remote.php/webdav /home/<username>/owncloud davfs user,rw,noauto 0 0
+  example.org/owncloud/remote.php/webdav /home/<username>/owncloud davfs user,rw,noauto 0 0
 
-Then, as each user who wants to mount the folder:
+  For each user for whom you wants to give mount privileges:
 
-1. Create the folders **owncloud/** and **.davfs2/** in your home directory
-2. Create the file secrets inside **.davfs2/**, fill it with the following (with your credentials where appropriate)::
+  1. Create the folders ``owncloud/`` and ``.davfs2/`` in your home directory.
 
-        example.org/owncloud/remote.php/webdav <username> <password>
+  2. Create the file ``secrets`` inside the ``.davfs2/`` folder and populate it with the following::
 
-3. Ensure the file is only writable by you either through the file manager, or via::
+    example.org/owncloud/remote.php/webdav <username> <password>
 
-        chmod 600 ~/.davfs2/secrets
+4. Ensure that the file is writable by only you by using the file manager or by issuing the following command::
 
-4. Run the command::
+  ``chmod 600 ~/.davfs2/secrets``
 
-        mount ~/owncloud
+5. Run the following command::
 
-5. To automatically mount the folder on login, add the command you used in step 4 to :file:`./.bashrc`
+  ``mount ~/owncloud``
+
+6. To automatically mount the folder on login, add the ``mount ~/owncloud`` command to the :file:`./.bashrc` file.
 
 Known Issues
 ^^^^^^^^^^^^
@@ -89,169 +102,212 @@ Known Issues
 
 **Solution:** If you experience trouble when you create a file in the directory, edit :file:`/etc/davfs2/davfs2.conf` and add::
 
-        use_locks 0
+    use_locks 0
 
 **Problem:** Certificate warnings
 
 **Solution:** If you use a self-signed certificate, you will get a warning. If you are willing to take the risk of a man in the middle attack, run this command instead::
 
-        echo "y" | mount ~/owncloud > /dev/null 2>&1
+    echo "y" | mount ~/owncloud > /dev/null 2>&1
+
+Accessing Files Using MAC OSX
+-----------------------------
+
+.. note:: The MAC OSX Finder suffers from a `series of implementation problems <http://sabre.io/dav/clients/finder/>`_ and should only be used if the ownCloud server runs on **Apache** and **mod_php**.
 
-MacOS
------
+To access files through the MAC OSX Finder:
 
-.. note:: Finder suffers from a `series of implementation problems <http://sabre.io/dav/clients/finder/>`_ and should only be used if the ownCloud server runs on **Apache** and **mod_php**
+1. Choose **Go > Connect to Server**.
 
-In the Finder, choose **Go > Connect to Server,** type the address of the server in the **Server Address** field, and click **Connect**.
+  The "Connect to Server" window opens.
 
-.. image:: ../images/osx_webdav1.png
-   :scale: 75%
+2. Specify the address of the server in the **Server Address** field.
 
-The URL that you have to use to connect to the ownCloud installation in finder is::
+  .. image:: ../images/osx_webdav1.png
+
+  For example, the URL address used to connect to the ownCloud installation from the MAC OSX Finder is::
 
   http://example.org/owncloud/remote.php/webdav
 
-.. image:: ../images/osx_webdav2.png
-   :scale: 75%
+  .. image:: ../images/osx_webdav2.png
+
+3. Click **Connect**.
+
+  The device connects to the server.
 
-For details, check the respective `vendor documentation`_ at the Apple website.
+For added details about how to connect to an external server using MAC OSX, check the respective `vendor documentation`_ .
 
 .. _`vendor documentation`: http://docs.info.apple.com/article.html?path=Mac/10.6/en/8160.html
 
-Windows
--------
-For Windows a seperate WebDAV client is recommended to access the files from your server. Choose one from the `WebDAV Project page <http://www.webdav.org/projects/>`_
+Accessing Files Using Microsoft Windows
+---------------------------------------
 
-Should you have to use the native implementation, you can assign ownCloud a drive letter. This allows you to
-browse files stored on an ownCloud server the way you would files stored in a mapped network drive.
+When using Microsoft Windows, a seperate WebDAV client is recommended to access
+the files from your server.You can choose a suitable WebDav client from the
+`WebDav Project page <http://www.webdav.org/projects/>`_ .
 
-Using this feature requires network connectivity. If you want to store
-your files offline, use the ownCloud Client to sync all files on your
-ownCloud to one or more directories of your local hard drive.
+If you must use the native implementation, you can map ownCloud to a new drive.
+Mapping to a drive enables you to browse files stored on an ownCloudserver the
+way you would files stored in a mapped network drive.
 
+Using this feature requires network connectivity. If you want to store your
+files offline, use the ownCloud Client to sync all files on your ownCloud to
+one or more directories of your local hard drive.
 
-.. note:: Prior to mapping your drive, you will need to permit the use of Basic Authentication in the Windows Registry. The procedure is documented in KB841215_ and differs between Windows XP/Server 2003 and Windows Vista/7. Please follow the Knowledge Base article before proceeding, and follow the Vista instructions if you run Windows 7.
+
+.. note:: Prior to mapping your drive, you must permit the use of Basic
+  Authentication in the Windows Registry. The procedure is documented in
+  KB841215_ and differs between Windows XP/Server 2003 and Windows Vista/7.
+  Please follow the Knowledge Base article before proceeding, and follow the
+  Vista instructions if you run Windows 7.
 
 .. _KB841215: http://support.microsoft.com/kb/841215
 
-Mapping via the command line
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Mapping Drives With the Command Line
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The following example shows how to map a drive using the command line.  To map the drive:
+
+1. Open a command prompt in Windows.
+2. Enter the following line in the command prompt to map to the computer Z drive::
 
-Suppose your ownCloud is installed at **https://example.org/owncloud**,
-that is, entering this URL in your web browser will bring up the login screen.
-Running::
+  net use Z: https://<drive_path>/remote.php/webdav /user:youruser yourpassword
 
-  net use Z: https://example.org/owncloud/remote.php/webdav /user:youruser yourpassword
+  where <drive_path> is **example.org/owncloud**
 
-will map the files of your ownCloud account to the drive letter Z:. An alternative
-syntax is::
+  For example: ``net use Z: https://example.org/owncloud/remote.php/webdav /user:youruser yourpassword``
 
-  net use Z: \\example.org at ssl\owncloud\remote.php\webdav /user:youruser yourpassword
+  The computer maps the files of your ownCloud account to the drive letter Z.
 
-Appending **/persistent** makes the connection persistent across reboots.
+  .. note:: Though not recommended, you can also mount the ownCloud server
+     using HTTP, leaving the connection unencrypted.  If you plan to use HTTP
+     connections on devices while in public place, we strongly recommend using a VPN
+     tunnel to provide the necessary security.
+
+An alternative command syntax is:
+
+  ``net use Z: \\example.org at ssl\owncloud\remote.php\webdav /user:youruser yourpassword``
+
+Appending **/persistent** makes the connection persistent across reboots. **(??Example??)**
 
 You can also mount your ownCloud via HTTP, leaving the connection unencrypted.
-Use either of the following syntaxes::
 
-  net use Z: http://example.org/owncloud/remote.php/webdav /user:youruser yourpassword
-  net use Z: \\example.org\owncloud\remote.php\webdav /user:youruser yourpassword
+Mapping Drives With Windows Explorer
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Please note that this allows anyone to sniff your ownCloud data with ease, especially on public WiFi hotspots. Plain HTTP should therefore only be used in conjunction with a VPN tunnel when used on Laptops.
+To map a drive using the Microsoft Windows Explorer:
 
-Using Windows Explorer
-~~~~~~~~~~~~~~~~~~~~~~
+1. Migrate to your computer in Windows Explorer.
+2. Right-click on **Computer** entry and select **Map network drive...** from the drop-down menu.
+3. Choose a local network drive to which you want to map ownCloud.
+4. Specify the address to your ownCloud instance, followed by **/remote.php/webdav**.
 
-Right-click on **Computer** entry and select **Map network drive...**. Choose a local network drive to map ownCloud to. Finally, enter the address to your ownCloud instance, followed by **/remote.php/webdav**, e.g. ::
+  For example::
 
   https://example.org/owncloud/remote.php/webdav
 
-for an SSL protected server. Check **Reconnect at logon** to make this mapping persistent across reboots. If you want to connect as another user, check **Connect using different credentials**.
+  .. note:: For SSL protected servers, check **Reconnect at logon** to ensure
+     that the mapping is persistent upon subsequent reboots. If you want to connect
+     to the ownCloud server as a different user, check **Connect using different
+     credentials**.
 
-.. figure:: ../images/explorer_webdav.png
+  .. figure:: ../images/explorer_webdav.png
    :scale: 80%
 
-   Mapping WebDAV on Windows Explorer.
+   **Mapping WebDAV on Windows Explorer**
+
+5. Click the ``Finish`` button.
+
+  Windows Explorer maps the network drive, making your ownCloud instance available.
+
+Accessing Files Using Cyberduck
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Cyberduck is an open source FTP and SFTP, WebDAV, OpenStack Swift, and Amazon S3 browser designed for file transfers.
 
-After pressing **Finish**, Windows Explorer will map the network drive and your ownCloud instance should be available
+.. note:: This example uses Cyberduck version 4.2.1.
 
-Using Cyberduck (4.2.1)
-~~~~~~~~~~~~~~~~~~~~~~~
+To use Cyberduck:
 
-Specify a server without any leading protocol information. e.g.:
+1. Specify a server without any leading protocol information. For example:
 
-Server
-  example.org
+  ``example.org``
 
-The port depends on whether your ownCloud server supports SSL or not. Cyberduck requires that you select a different connection type depending on whethr SSL is to be used ('WebDAV' or 'WebDAV (HTTPS/SSL)'):
+2. Specify the appropriate port.  The port you choose depends on whether or not
+your ownCloud server supports SSL. Cyberduck requires that you select a
+different connection type if you plan to use SSL.  For example:
 
-Port
   80 (for WebDAV)
   443 (for WebDAV (HTTPS/SSL))
 
-Use the 'More Options' drop-down menu to add the rest of your WebDAV URL into the 'Path' field. e.g.:
+3. Use the 'More Options' drop-down menu to add the rest of your WebDAV URL into the 'Path' field. For example:
 
-Path
-  remote.php/webdav
+  ``remote.php/webdav``
+
+  Cyberduck enables file access to the ownCloud server.
 
 Known Problems
 ~~~~~~~~~~~~~~
 
+**Problem**
+  Windows does not connect using HTTPS.
 
-Problem
-  Windows refuses to connect via HTTPS
-
-Solution
-  The Windows WebDAV Client does not support Server Name Indication (SNI) on
+**Solution**
+  The Windows WebDAV Client might not support Server Name Indication (SNI) on
   encrypted connections. If you encounter an error mounting an SSL-encrypted
-  ownCloud instance, please contact your provider about assigning a dedicated
-  IP address for your SSL-based server.
+  ownCloud instance, contact your provider about assigning a dedicated IP address
+  for your SSL-based server.
+
+**Problem**
+  You receive the following error message:
+  **Error 0x800700DF: The file size exceeds the limit allowed and cannot be saved.**
 
-Problem
-  I receive the error **Error 0x800700DF: The file size exceeds the limit allowed and cannot be saved.**
+**Solution**
+  Windows limits the maximum size a file transferred from or to  a WebDAV share
+  may have.  You can increase the value **FileSizeLimitInBytes** in
+  **HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WebClient\Parameters**
+  by clicking on **Modify**.
 
-Solution
-  Windows limits the maximum size a file transferred from or to  a WebDAV
-  share may have.  You can increase the value **FileSizeLimitInBytes** in
-  **HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WebClient\Parameters**.
-  by clicking on **Modify**. In order to increase the limit to the maximum
-  value of 4GB, pick **Decimal** and enter **4294967295** as value. Afterwards,
-  reboot Windows or restart the **WebClient** service.
+  To increase the limit to the maximum value of 4GB, select **Decimal**, enter
+  a value of **4294967295**, and reboot Windows or restart the **WebClient**
+  service.
 
-.. todo::
+.. todo:: document registry keys on file size limit and not complaining in no network cases
 
-   document registry keys on file size limit and not complaining in no network cases
 
+Using the Desktop Sync Client to Access Files
+---------------------------------------------
 
-Sync Client
------------
-However, some applications only allow you to save to a local folder. To
-get around this issue, you can use the `ownCloud sync clients`_
+Some applications enable you to only save to a local folder. To circumvent this issue, you can install the `ownCloud sync clients`_.
 
-Mobile
--------
-To connect to your ownCloud server with the **ownCloud** mobile apps, use the base URL and folder only::
+Using Mobile Apps to Access Files
+---------------------------------
+
+.. todo:: Needs updating
+
+To connect to your ownCloud server with any **ownCloud** mobile apps, use the base URL and folder only::
 
     example.org/owncloud
 
-No need to add remote.php/webdav as you do for any other WebDAV client.
+.. note:: There is no need to add remote.php/webdav as you do for other WebDAV clients.
+
+Mobiel apps currently exist for both `Android`_ and `webOS`_. Feel free to `contribute, if you can`_!
 
-There are apps in development for both `Android`_ and `webOS`_. Feel
-free to `contribute, if you can`_! Right now you can use other apps to
-connect to ownCloud from your phone via WebDAV. `WebDAV Navigator`_ is a
-good (proprietary) app for `Android App`_ , `iPhone`_ & `BlackBerry`_.
+In addition to the mobile apps provided by ownCloud, you can use other apps to connect to ownCloud from your mobile device using WebDAV. `WebDAV Navigator`_ is a
+good (proprietary) app for `Android`_ devices, `iPhones`_, and `BlackBerry`_ devices.
 
 The URL for these is::
 
     example.org/owncloud/remote.php/webdav
 
 .. _in your file manager: http://en.wikipedia.org/wiki/Webdav#WebDAV_client_applications
-.. _ownCloud sync clients: http://owncloud.org/sync-clients/
+.. _ownCloud sync clients: http://owncloud.org/documentation/sync-clients/
 .. _Mount ownCloud to a local folder without sync: http://owncloud.org/use/webdav/
 .. _ownCloud Mirall repository: https://github.com/owncloud/mirall
 .. _Android: http://github.com/owncloud/android
 .. _webOS: http://github.com/owncloud/webos
 .. _contribute, if you can: /contribute/
 .. _WebDAV Navigator: http://seanashton.net/webdav/
-.. _Android App: https://play.google.com/store/apps/details?id=com.schimera.webdavnavlite
-.. _iPhone: https://itunes.apple.com/app/webdav-navigator/id382551345
+.. _Android: https://play.google.com/store/apps/details?id=com.schimera.webdavnavlite
+.. _iPhones: https://itunes.apple.com/app/webdav-navigator/id382551345
 .. _BlackBerry: http://appworld.blackberry.com/webstore/content/46816
diff --git a/user_manual/files/filesweb.rst b/user_manual/files/filesweb.rst
index 827cf34..bd3c040 100644
--- a/user_manual/files/filesweb.rst
+++ b/user_manual/files/filesweb.rst
@@ -1,89 +1,139 @@
-Accessing your Files (Web Interface)
-====================================
+Accessing your Files Using the Web Interface
+============================================
 
-Your ownCloud files can be accessed from anywhere by using your ownCloud's web interface. In the files app,
-you can view (if a common type), move, rename, download, share and delete your files easily. If versioning app is
-enabled, you can also revert a file to specific version. See :doc:`versioncontrol` for details.
+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.
 
 .. figure:: ../images/oc_filesweb.png
 
-	Files app on ownCloud web interface
+	**ownCloud web interface Files app**
+
+ownCloud versio 7 enables you to see file thumbnails next to the filenames.
+Hovering over a file or folder provides the following highlighted list of
+operations:
+
+* :guilabel:`Rename` -- 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:`Delete` -- Deletes the selected file or folder.
 
-With ownCloud 6, you can now see file thumbnails next to the filenames. By hovering your cursor on a file, you
-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. If the file is an editable
-office file, it will also show *Edit* button to open the file in documents app (if this app is enabled).
 
 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:
+Navigating through folders in ownCloud is as simple as clicking on a folder to
+open it and using the back button on your browser to move to a previous level.
+For added convenience, ownCloud also provides a navigation bar at the top of
+the Files field for quick navigation.
 
 .. figure:: ../images/oc_filesweb_navigate.png
 
-	Navigation bar
+   Navigation bar
 
-You can click on one of the upper directories to navigate up or use home icon to navigate back into your root
-folder.
+The navigation bar functions as a "breadcrumb" locator.  It indicates your
+current directory and enables you to migrate back to one of the upper
+directories or, using the home icon, to navigate back into your root folder.
 
 
-Creating/uploading files
-------------------------
+Creating or Uploading Files and Directories
+-------------------------------------------
 
-You can create files by simply clicking on *New* button on files app. The *New* button will provide three
-options to choose from:
+ownCloud enables you to create new files or folders directly in an ownCloud
+folder by clicking on the *New* button in the Files app.
 
 .. figure:: ../images/oc_filesweb_new.png
 
-	New button options
+   New button options
+
+The *New* button provides the following three options from which to choose:
 
-* *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 it into the current folder.
+* *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.
 
 
-Selecting files
----------------
+Selecting Files or Folders
+--------------------------
 
-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 just above the first file/folder on the list.
+You can select one or more files or folders by clicking on the small thumbnails
+or icons that represent them. When you select a file or folder, a small
+checkbox is populated with a check to indicate that it is selected.  To select
+all files in the current directory, you can click on the checkbox located at
+the top of the Files app field, above the first file or 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.
+If you select multiple files, you can deleted all of the selected files or
+download them as a ZIP file by using the ``Delete`` or ``Download`` buttons at
+the top right side of the Files app field.
 
-Viewing files
+.. note:: If the ``Download`` button is not visible, the administrator has
+   disabled this feature.  Contact your administrator for further guidance.
+
+Viewing Files
 -------------
 
-ownCloud can display uncompressed text files, OpenDocument files, PDFs, and image files by simply clicking on
-the file name. If displaying of a file is not possible, a download process will start.
+You can display uncompressed text files, OpenDocument files, PDFs, and image
+files from the ownCloud server by clicking on the file name. If ownCloud cannot
+display a file, a download process starts and the file is downloaded to your
+system.
 
 Moving files
 ------------
 
-In ownCloud web interface, file(s) can be moved by dragging and dropping them into a sub-directory. If you would like to move a directory to an upper directory, drag the file(s) into one of the folders shown in navigation bar (depicted above).
+Using the ownCloud web interface, you can move files and folders by dragging
+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
 -------------
 
-Any file/folder on ownCloud can be shared to download with a local user, group or any person online with a public link. Shared files/folders will show a *Shared* text next to their names.
+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.
+
+To share a file or folder:
+
+1. Using your cursor, hover over on an item in the Files app field.
+
+2. Locate the **Share** icon in the file or folder row.
+
+3. Click *Share*.
+
+	The Share dialog box opens to show the following options:
+
+	.. figure:: ../images/oc_files_share.png
+
+           Share dialog box
+
+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.
 
-To share a file/folder, hover your cursor on an item in the files app and click *Share*. You will be provided with some options:
+			.. note:: The server must be configured with a mail server or mail server access.
 
-.. figure:: ../images/oc_files_share.png
+		- **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.
 
-	Share dialog
+		.. figure:: ../images/oc_share_expiration_calendar.png
 
-* The first field is to share this file/folder with local users/groups. This is very useful
-  if you are in a company and want to create a quick share with a colleague.
-* If you click on *Share link*, the other options will be visible. Since this link allows everyone
-  to download this file/folder, you may want to protect this share with a password. To do that,
-  click on *Password protect* and set a password.
-* If this share is a folder, you will also have an option to enable uploads into this folder using
-  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 separated with space to send the link to multiple users.
-* Finally, setting an expiration date will expiry the share after the specified date.
+		Expiration Date Calendar
 
-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 trash icon
-on the same line with the users.
diff --git a/user_manual/files/quota.rst b/user_manual/files/quota.rst
index 09209fc..a347f70 100644
--- a/user_manual/files/quota.rst
+++ b/user_manual/files/quota.rst
@@ -1,45 +1,74 @@
 Storage Quota
 =============
 
-ownCloud makes it possible to specify a storage quota for users which is the **maximum space** a user is allowed to use for files located in their individual home storage.
+ownCloud enables you to specify a storage quota for users which is the
+**maximum space** a user is allowed to use for files located in their
+individual home storage.
 
-.. note:: When setting a quota, administrators need to be aware that it **only applies to actual files**, not application metadata. This means that when allocating a quota, they need to make sure there at least 10% more space available for a given user.
+.. note:: Quota settings **only apply to actual files**, not application
+   metadata. Application metadate consumes an added 10% of space for any given
+   user.  When allocating quotas, you must ensure that there is at least 10% more
+   space available for each user.
 
-Checking the available space
-----------------------------
+Checking Available Space
+------------------------
 
-You can check your available space by going to the "Personal" page from the top-right menu.
+You can check available space by accessing the "Personal Settings" page.  To
+access your personal settings:
+
+1. Click the Personal Settings dropdown menu to the right of the Search field
+   in the ownCloud Main User Interface.
+	.. figure:: images/oc_personal_settings_dropdown.png
+
+	Personal Settings menu
+
+2. Select "Personal" from the menu. The Personal Settings window opens.
+	.. figure:: images/oc_personal_settings_window.png
 
 The available space of a given user is calculated using the following formula::
 
     available_space = min(quota, disk_free_space) - used_space
 
-``disk_free_space`` is the space available on the partition on which the user's home storage is located on the server. It could happen that the available space on that partition is less than the user's quota.
+``disk_free_space`` is the space available on the partition on which the home
+storage for a user is located on the server.
 
-Sharing
--------
+.. note:: It is possible that the available space on a partition is less than
+   the user quota.
 
-When sharing files or directories, their used space is counted in the owner's quota.
+.. todo:: ??So what do we do in that case??
 
-Shared files
-~~~~~~~~~~~~
+Available Space and Sharing
+---------------------------
 
-If user A shares a file F with user B, the size of F will be counted in user A's storage, even if the file is modified or its size is increased by user B.
+When sharing files or folders, the space that each file or folder (along with
+the folder contents) uses is counted in the quota for the user who is sharing
+the files or folders.  For example:
 
-Shared directories
-~~~~~~~~~~~~~~~~~~
+**Example: Available Space and Shared Files**
+
+If user 'A' shares a file with user 'B,' the size of the file is counted
+against the storage quota for user 'A', even if the file is modified or its
+size is increased by user 'B.''
+
+**Example: Available Space and Shared Folders**
 
-If user A shares a directory D with user B, any file that is modified or uploaded by user B inside of directory D will count in user A's used space.
+If user 'A' shares a folder with user 'B,' the size of the folder (along with
+its contents) is counted against the storage quota for user 'A.'  This means
+that any file that is modified or uploaded by user 'B' inside of the shared
+folder counts against the storage quota for user 'A.'
 
 Resharing
 ~~~~~~~~~
 
-When resharing a file or a directory, the used space is still counted in the quota of the owner who shared it initially.
+When resharing a file or a directory, the used space is still counted in the
+quota of the owner who shared it initially.
 
 Public sharing with upload permission
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-If user A publicly shares (share with link) a directory D and enables the "public upload" permission, people with the link will be able to upload files into D and their sizes will be counted in user A's used space.
+If user A publicly shares (share with link) a directory D and enables the
+"public upload" permission, people with the link will be able to upload files
+into D and their sizes will be counted in user A's used space.
 
 Excluded from quota
 -------------------
@@ -47,37 +76,51 @@ Excluded from quota
 Metadata and cache
 ~~~~~~~~~~~~~~~~~~
 
-Application metadata and cached information are excluded from the total used space.
+Application metadata and cached information are excluded from the total used
+space.
 
-Such data could be thumbnails (icon previews, pictures app), temporary files, encryption keys, etc.
+Such data could be thumbnails (icon previews, pictures app), temporary files,
+encryption keys, etc.
 
-Some apps are also storing information directly in the database (not as files) like the :doc:`calendar <../pim/calendar>` and :doc:`contacts <../pim/contacts>` apps. This data is also excluded from the total used space.
+Some apps are also storing information directly in the database (not as files)
+like the :doc:`calendar <../pim/calendar>` and :doc:`contacts
+<../pim/contacts>` apps. This data is also excluded from the total used space.
 
 
 Deleted files
 ~~~~~~~~~~~~~
 
-When deleting files, these are moved/copied to the :doc:`trashbin <deletedfiles>` at first. These files do not count in the user's used space.
+When deleting files, these are moved/copied to the :doc:`trashbin
+<deletedfiles>` at first. These files do not count in the user's used space.
 
-For example with a quota of 10 GB, if the user has 4 GB used space and 5 GB in the trashbin, they will still see 6 GB free space. If the user uploads 6 GB of files at this point, the :doc:`trashbin app <deletedfiles>` will discard deleted files when necessary to make room for the new files.
+For example with a quota of 10 GB, if the user has 4 GB used space and 5 GB in
+the trashbin, they will still see 6 GB free space. If the user uploads 6 GB of
+files at this point, the :doc:`trashbin app <deletedfiles>` will discard
+deleted files when necessary to make room for the new files.
 
 Version Control
 ~~~~~~~~~~~~~~~
 
 The size of older file versions does not count in the used space.
 
-For example with a quota of 10 GB, if the user has 4 GB used space and 5 GB of older file versions, they will still see 6 GB free space. If the user uploads 6 GB of files at this point, the :doc:`versions app <versioncontrol>` will discard older versions when necessary to make room for the new files.
+For example with a quota of 10 GB, if the user has 4 GB used space and 5 GB of
+older file versions, they will still see 6 GB free space. If the user uploads 6
+GB of files at this point, the :doc:`versions app <versioncontrol>` will
+discard older versions when necessary to make room for the new files.
 
-See :doc:`versioncontrol` for details about the version expiration behavior. 
+See :doc:`versioncontrol` for details about the version expiration behavior.
 
 Encryption
 ~~~~~~~~~~
 
-When files are :doc:`encrypted <encryption>`, they take slightly more physical space than the original files. Only the original size will be counted in the used space.
+When files are :doc:`encrypted <encryption>`, they take slightly more physical
+space than the original files. Only the original size will be counted in the
+used space.
 
 External storage
 ~~~~~~~~~~~~~~~~
 
-When mounting external storage, either as administrator or as user, the space available on that storage is not taken into account for the user's quota.
+When mounting external storage, either as administrator or as user, the space
+available on that storage is not taken into account for the user's quota.
 It is currently not possible to set a quota for external storage.
 
diff --git a/user_manual/files/sync.rst b/user_manual/files/sync.rst
index 5526979..992121f 100644
--- a/user_manual/files/sync.rst
+++ b/user_manual/files/sync.rst
@@ -19,4 +19,4 @@ mount your ownCloud storage via WebDAV, which is also documented in the next cha
 
 
 .. _ownCloud Client: http://owncloud.org/sync-client/
-.. _ownCloud Desktop Client Manual:  http://doc.owncloud.org/desktop/
+.. _ownCloud Desktop Client Manual:  http://doc.owncloud.org/desktop
diff --git a/user_manual/images/Thumbs.db b/user_manual/images/Thumbs.db
new file mode 100644
index 0000000..5e3d50c
Binary files /dev/null and b/user_manual/images/Thumbs.db differ
diff --git a/user_manual/images/calendar_createevent.png b/user_manual/images/calendar_createevent.png
index 5ca9bb3..ceabce3 100644
Binary files a/user_manual/images/calendar_createevent.png and b/user_manual/images/calendar_createevent.png differ
diff --git a/user_manual/images/calendar_export.png b/user_manual/images/calendar_export.png
index 916cedf..ffcde28 100644
Binary files a/user_manual/images/calendar_export.png and b/user_manual/images/calendar_export.png differ
diff --git a/user_manual/images/calendar_import.png b/user_manual/images/calendar_import.png
index 9806f99..17fb7e3 100644
Binary files a/user_manual/images/calendar_import.png and b/user_manual/images/calendar_import.png differ
diff --git a/user_manual/images/calendar_manage-calendars.png b/user_manual/images/calendar_manage-calendars.png
index 610cfcb..e1b6a9a 100644
Binary files a/user_manual/images/calendar_manage-calendars.png and b/user_manual/images/calendar_manage-calendars.png differ
diff --git a/user_manual/images/calendar_newtimezone1.png b/user_manual/images/calendar_newtimezone1.png
index 961c58c..db0f333 100644
Binary files a/user_manual/images/calendar_newtimezone1.png and b/user_manual/images/calendar_newtimezone1.png differ
diff --git a/user_manual/images/contact_crop.jpg b/user_manual/images/contact_crop.jpg
index 6231a5a..57b12f8 100644
Binary files a/user_manual/images/contact_crop.jpg and b/user_manual/images/contact_crop.jpg differ
diff --git a/user_manual/images/contact_emptycontact.png b/user_manual/images/contact_emptycontact.png
index 97b0e74..ae5c09d 100644
Binary files a/user_manual/images/contact_emptycontact.png and b/user_manual/images/contact_emptycontact.png differ
diff --git a/user_manual/images/contact_picture.jpg b/user_manual/images/contact_picture.jpg
index 089ac71..5d9a6de 100644
Binary files a/user_manual/images/contact_picture.jpg and b/user_manual/images/contact_picture.jpg differ
diff --git a/user_manual/images/files_versioning.png b/user_manual/images/files_versioning.png
index b44f8ff..48388c8 100644
Binary files a/user_manual/images/files_versioning.png and b/user_manual/images/files_versioning.png differ
diff --git a/user_manual/images/oc_apps_dropdown.png b/user_manual/images/oc_apps_dropdown.png
new file mode 100644
index 0000000..06b4870
Binary files /dev/null and b/user_manual/images/oc_apps_dropdown.png differ
diff --git a/user_manual/images/oc_connect.png b/user_manual/images/oc_connect.png
index 902b0b2..ec41aae 100644
Binary files a/user_manual/images/oc_connect.png and b/user_manual/images/oc_connect.png differ
diff --git a/user_manual/images/oc_documents.png b/user_manual/images/oc_documents.png
index 878ea41..0537ffb 100644
Binary files a/user_manual/images/oc_documents.png and b/user_manual/images/oc_documents.png differ
diff --git a/user_manual/images/oc_filesweb.png b/user_manual/images/oc_filesweb.png
index 15b2785..54658c8 100644
Binary files a/user_manual/images/oc_filesweb.png and b/user_manual/images/oc_filesweb.png differ
diff --git a/user_manual/images/oc_main_web.png b/user_manual/images/oc_main_web.png
new file mode 100644
index 0000000..d3076dd
Binary files /dev/null and b/user_manual/images/oc_main_web.png differ
diff --git a/user_manual/images/oc_main_web_labelled.png b/user_manual/images/oc_main_web_labelled.png
new file mode 100644
index 0000000..7e59a58
Binary files /dev/null and b/user_manual/images/oc_main_web_labelled.png differ
diff --git a/user_manual/images/oc_main_web_labelled.snag b/user_manual/images/oc_main_web_labelled.snag
new file mode 100644
index 0000000..d7d8af9
Binary files /dev/null and b/user_manual/images/oc_main_web_labelled.snag differ
diff --git a/user_manual/images/oc_personal_settings_dropdown.png b/user_manual/images/oc_personal_settings_dropdown.png
new file mode 100644
index 0000000..1d3f2f6
Binary files /dev/null and b/user_manual/images/oc_personal_settings_dropdown.png differ
diff --git a/user_manual/images/oc_personal_settings_dropdown.snag b/user_manual/images/oc_personal_settings_dropdown.snag
new file mode 100644
index 0000000..b6a33f4
Binary files /dev/null and b/user_manual/images/oc_personal_settings_dropdown.snag differ
diff --git a/user_manual/images/oc_personal_settings_window.png b/user_manual/images/oc_personal_settings_window.png
new file mode 100644
index 0000000..73f8673
Binary files /dev/null and b/user_manual/images/oc_personal_settings_window.png differ
diff --git a/user_manual/images/oc_personal_settings_window.snag b/user_manual/images/oc_personal_settings_window.snag
new file mode 100644
index 0000000..20d4b88
Binary files /dev/null and b/user_manual/images/oc_personal_settings_window.snag differ
diff --git a/user_manual/images/oc_share_expiration_calendar.png b/user_manual/images/oc_share_expiration_calendar.png
new file mode 100644
index 0000000..1406c57
Binary files /dev/null and b/user_manual/images/oc_share_expiration_calendar.png differ
diff --git a/user_manual/images/oc_share_with_options.png b/user_manual/images/oc_share_with_options.png
new file mode 100644
index 0000000..86b22e5
Binary files /dev/null and b/user_manual/images/oc_share_with_options.png differ
diff --git a/user_manual/images/oc_ui.png b/user_manual/images/oc_ui.png
index 5e4cda2..4ddbea7 100644
Binary files a/user_manual/images/oc_ui.png and b/user_manual/images/oc_ui.png differ
diff --git a/user_manual/images/owncloud_webinterface.kra b/user_manual/images/owncloud_webinterface.kra
index 6660ecc..0d45414 100644
Binary files a/user_manual/images/owncloud_webinterface.kra and b/user_manual/images/owncloud_webinterface.kra differ
diff --git a/user_manual/images/owncloud_webinterface_map.png b/user_manual/images/owncloud_webinterface_map.png
index 00ef486..cfd5588 100644
Binary files a/user_manual/images/owncloud_webinterface_map.png and b/user_manual/images/owncloud_webinterface_map.png differ
diff --git a/user_manual/index.rst b/user_manual/index.rst
index a0c2cb2..d1f5683 100644
--- a/user_manual/index.rst
+++ b/user_manual/index.rst
@@ -1,25 +1,45 @@
 .. _index:
 
-==================
-User Documentation
-==================
-**Welcome to ownCloud, your self-hosted file sync and share solution.**
-
-ownCloud is open source file sync and share software for everyone from individuals operating the free Community Edition, to large enterprises and service providers operating ownCloud Enterprise Edition. ownCloud provides a safe, secure and compliant file sync and share solution on servers you control.
-
-With ownCloud you can share one or more folders on your PC, and sync them with your ownCloud server. Place files in your local shared directories, and those files are immediately synced to the server, and then to other PCs via the desktop client. Not near a desktop client? No problem, simply log in with the web client and manage your files there. The Android and iOS mobile apps allow you to browse, download and upload photos and videos. On Android, you may also create, download, edit and [...]
-
-Whether using a mobile device, a workstation, or a web client, ownCloud provides the ability to put the right files in the right hands at the right time on any device in one simple-to-use, secure, private and controlled solution. After all, with ownCloud, it’s Your Cloud, Your Data, Your Way.
-
-Web interface
+=====================================
+ownCloud |version| User Documentation
+=====================================
+
+**Welcome to ownCloud: your self-hosted file sync and share solution.**
+
+ownCloud is open source file sync and share software for everyone from
+individuals operating the free ownCloud Community Edition, to large enterprises
+and service providers operating the ownCloud Enterprise Edition. ownCloud
+provides a safe, secure, and compliant file synchronization and sharing
+solution on servers that you control.
+
+With ownCloud you can share one or more files and folders on your computer, and
+synchronize them with your ownCloud server. Place files in your local shared
+directories, and those files are immediately synchronized to the server and to
+other devices using the ownCloud Desktop Client. Not near a device running a
+desktop client? No problem! Simply log in using the ownCloud web client and
+manage your files from there. The ownCloud Android and iOS mobile applications
+enable you to browse, download, and upload photos and videos. On Android, you
+can also create, download, edit, and upload any other files, as long as the
+correct software is installed.
+
+Whether you are using a mobile device, a workstation, or a web client, ownCloud
+provides the ability to put the right files in the right hands at the right
+time on any device with one simple-to-use, secure, private and controlled
+solution. After all, with ownCloud, it’s Your Cloud, Your Data, Your Way.
+
+Web Interface
 =============
-This chapter contains a general overview how you access ownCloud from a Browser like Firefox, Chrome or Internet Explorer
+The following topic contains a general overview how to access ownCloud from a
+web browser like Firefox, Chrome, or Internet Explorer:
 
 * :doc:`webinterface`
 
-Files & Synchronization
-=======================
-This chapter contains information about accessing your files via WebDAV and Synchronization.
+File Access and Management
+==========================
+The following topics contain information about file access and management.
+Access information includes how to access your server using the ownCloud web
+interface or through the use of WebDAV shares (Linux or Mac OSX) or web folders
+(Windows):
 
 * :doc:`files/filesweb`
 * :doc:`files/files`
@@ -31,9 +51,12 @@ This chapter contains information about accessing your files via WebDAV and Sync
 * :doc:`files/configuring_big_file_upload`
 
 
-Contacts & Calendar
-===================
-Contacts & Calendar web interface, export, import and synchronization.
+Contacts and Calendar
+=====================
+The following topic provides information about the **Contacts** and
+**Calendar** applications including usage instructions as well as how to
+export, import, and synchronization the ownCloud calendar application with
+different operating system calendars:
 
 * :doc:`pim/calendar`
 * :doc:`pim/contacts`
@@ -43,25 +66,30 @@ Contacts & Calendar web interface, export, import and synchronization.
 
 Documents
 =========
-Documents allows users collaboratively edit rich-text documents at the same time.
+The following topic describes how to use the **Documents** application to
+enable multiple users to collaboratively edit rich-text documents
+simultaneously.
 
 * :doc:`documents`
 
 Bookmarks
 =========
-Web interface for managing your bookmarks.
+The following topic describes how to use the ownCloud **Bookmarks** appliction
+to manage your bookmarks:
 
 * :doc:`bookmarks`
 
 Backup
 ======
-Import and export your user account settings.
+The following topic describes the ownCloud **User_Migrate** appliction used to
+import and export user account settings:
 
 * :doc:`migration`
 
 External storage
 ================
-Mount external storages into ownCloud.
+The following topic describes how to mount external storage locations to the
+ownCloud server.
 
 * :doc:`external_storage/google_drive`
 
diff --git a/user_manual/pim/calendar.rst b/user_manual/pim/calendar.rst
index a5b0dea..646e89b 100644
--- a/user_manual/pim/calendar.rst
+++ b/user_manual/pim/calendar.rst
@@ -1,204 +1,99 @@
 Using the Calendar App
 ======================
 
-.. figure:: ../images/calendar_manage-calendars.png
-
-  Calendar view with global settings pane is open
-
-.. _managing-calendars:
+Creating a calendar
+-------------------
 
-Managing calendars
-------------------
-
-You can manage your calendars by clicking appropriate buttons next to
-your calendar in the calendar list on the left. You can also click on |gear| icon
-to change global settings for all calendars. Here, there will be also
-links for CalDAV access.
-
-Create
-~~~~~~
+.. figure:: ../images/calendar_manage-calendars.png
+Calendar view
 
 If you use the calendar the first time, there will be already a calendar called
-"Personal". To create another calendar, click on *New Calendar* button on the left
-pane, type a calendar name and pick a color. Then, click on the tick button to
-complete.
-
-.. _eds:
-
-Edit/Delete
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-To edit a calendar name and/or color, click on the |pencil| icon and change the values.
-Then, click on the tick button to apply changes.
-
-.. |pencil| image:: ../images/pencil.png
+"Default calendar". You can manage your calendars with a click on the "Calendar"
+button in the top right corner. In the dialog, which will appear, you can add,
+edit, export, enable, disable and delete your calendars. There will be also a
+link for CalDAV access.
 
-To delete a calendar, click on the |cross| icon next to the calendar name.
-
-.. |cross| image:: ../images/cross.png
+Synchronising Calendars with CalDAV
+-----------------------------------
 
+Assuming you access your web interface via an address like this::
 
-Show/Hide
-~~~~~~~~~
+  http://ADDRESS
 
-To hide/show a calendar, click on the color next to the calendar name. The calendar view
-will be refreshed automatically. Currently, in shared calendars, only the users with update
-permission can hide/show the calendars.
+Then you can access your calendars with CalDAV-compatible programs like
+Kontact, Evolution, Thunderbird using the following URL::
 
+  http://ADDRESS/remote.php/caldav
 
-Share
-~~~~~
+To use the ownCloud calendar with Apple iCal you will need to use the following
+URL, including the trailing slash::
 
-Calendar sharing is done in the same way as the other apps in ownCloud. To share a calendar,
-click on the |share| icon and fill in the desired fields.
+  http://ADDRESS/remote.php/caldav/principals/username/
 
-.. |share| image:: ../images/share.png
+Mozilla Lightning users need to this URL scheme::
 
-A calendar can be shared with a user, group, and/or public. It can have a password and a
-expiration date which will expiry the share after the specified date.
+  https://ADDRESS/remote.php/caldav/calendars/USERNAME/CALENDARNAME
 
-If the calendar is shared with a user or group, it is possible to set permissions to
-create, edit, delete, and share the events in it.
+   Example for a simple calendar: The "Default calendar" is referred to as "defaultcalendar",
+   and the users' name here is "test".
+   The full URL (which on the picture can't be seen because of the
+   short edit field) is then::
 
+       https://localhost/owncloud/remote.php/caldav/calendars/test/defaultcalendar
 
-Import
-~~~~~~
+.. Note: the calendar names are lowercased and the spaces removed. They are not to be URL-encoded anymore.
 
-.. figure:: ../images/calendar_import.png
+Creating events
+---------------
 
-  Importing calendar
+To create an event just click on the date in the month view or choose the
+timeframe in the weekview. In the dialog which will appear you can enter your
+information like title, category, etc.
 
-Importing your calendar as iCal file is done by using the files app. Upload the iCal file
-and just click on the calendar file to open the import dialog. You can import the calendar
-into a new calendar or an already existing one.
+.. figure:: ../images/calendar_createevent.png
+New event window
 
-.. note:: If the progress bar does not work properly, the folder
-          ``apps/calendar/import_tmp/`` has probably no write permission. Please contact
-          your administrator for this issue.
+With the advanced options you can set the
+description, the location and the repetition rate of an event. If the repeating
+should end you can choose between setting the end by date or by occurrences. If
+you choose in the weekview all days from Monday to Friday it will automatically
+set the repeat rule to "every weekday". If the interval of the weekview can be
+divided by two it automatically set the repeat rule to "Bi-Weekly".
 
-.. _export-calendar:
+Exporting / Importing events
+----------------------------
 
 Export
 ~~~~~~
 
-If you want to export a whole calendar to an iCal file, use the |download| icon
-next to your calendar in the calendar list.
-
-.. |download| image:: ../images/download.png
-
 .. figure:: ../images/calendar_export.png
+Exporting an event
 
-  Exporting calendar
-
-Managing events
----------------
-
-Create events
-~~~~~~~~~~~~~
-
-To create an event, just click on the date in the month view or choose the
-timeframe in the weekview. In the dialog which will appear, you can enter the event
-information such as title, category, etc. If there is more than one calendar, you will
-be given an option to choose the calendar in which you would like to create the event.
-
-.. figure:: ../images/calendar_createevent.png
-
-  New event window
-
-With the advanced options you can set the description, the location, categories etc.
-
-In the repeating tab, you can choose one from various options. If repeating should end,
-you can choose between setting the end by date or by occurrences by clicking *Advanced*
-button next to the repeat option.
-
-.. note:: Events are draggable. You can also bring the mouse cursor close to the right
-	  (in monthly view) or bottom (in weekview or day view) of an event to adjust
-	  date/time.
+You can export either a single event or a whole calendar. If you want to export
+a single event click on it and press the export button in the bottom right
+corner. If you want to export a whole calendar use the "Calendar" button as
+described in the chapter "Creating a calendar".
 
+Import
+~~~~~~
 
-Edit/Delete events
-~~~~~~~~~~~~~~~~~~
-
-Events can be edited by clicking on them in the calendar view. To export or share,
-an event needs to be saved first. You can also delete the event by clicking
-on *Delete event*.
-
-Import events
-~~~~~~~~~~~~~
+.. figure:: ../images/calendar_import.png
+Importing events
 
-Importing events is done as importing calendars. Upload your event's iCal file
-using the files app. Then, click on the event file to open the import dialog.
-You can import the event into a new calendar or an already existing one.
+Import your calendar as iCal file using the files app. Just click on the
+calendar file to open the import dialog. You can import the calendar into a new
+calendar or into an already existing calendar.
 
 .. note:: If the progress bar does not work properly, the folder
-          ``apps/calendar/import_tmp/`` has probably no write permission. Please contact
-          your administrator for this issue.
-
-Export events
-~~~~~~~~~~~~~
-
-If you want to export a single event click on it and press the *Export* button
-on the bottom left corner of the event (you need to expand *Advanced* settings
-in event editing window to see this button).
-
-To export all events in calendar see :ref:`export-calendar` section in :ref:`managing-calendars`.
-
-
-Synchronising Calendars with CalDAV
------------------------------------
-
-To synchronise the calendars with your favourite calendar software, you can
-use the *CalDAV Links* of your calendars.
-
-To get this link, click on the |caldav| icon next to your calendar name in the
-calendars list. You will be provided with a link to access your calendars
-with the software you like.
-
-.. |caldav| image:: ../images/caldav.png
-
-To get the global link of your calendars, click on the |gear| icon on the bottom
-left of the calendar app and copy the relevant address.
-
-To manually get those addresses, please follow the following steps.
-
-Assuming you access your web interface via an address like this::
-
-  http://ADDRESS
-
-Then you can access your calendars with CalDAV-compatible programs like
-Kontact, Evolution, Thunderbird using the following URL::
-
-  http://ADDRESS/remote.php/caldav
-
-To use the ownCloud calendar with Apple iCal you will need to use the following
-URL, including the trailing slash::
-
-  http://ADDRESS/remote.php/caldav/principals/username/
-
-Mozilla Lightning users need to this URL scheme::
-
-  https://ADDRESS/remote.php/caldav/calendars/USERNAME/CALENDARNAME
-
-   Example for a simple calendar: The "Default calendar" is referred to as "defaultcalendar",
-   and the username here is "test".
-   The full URL is then:
-
-       https://ADDRESS/remote.php/caldav/calendars/test/defaultcalendar
-
-.. note:: Calendar names are lowercased and the spaces removed. They are not to be URL-encoded
-	  anymore.
-
+          ``apps/calendar/import_tmp/`` has probably no write permission.
 
 Why is the calendar app asking for my current location?
 -------------------------------------------------------
 
 .. figure:: ../images/calendar_newtimezone1.png
-
-  Timezone set notification
+Timezone set notification
 
 The calendar needs your current position in order to detect your timezone.
 Without the correct timezone there will be a time offset between the events in
 ownCloud and your desktop calendar you synchronise with ownCloud. You can also
 set the timezone manually in the personal settings.
-
-.. |gear| image:: ../images/gear.png
diff --git a/user_manual/pim/contacts.rst b/user_manual/pim/contacts.rst
index 3f5f23b..953042d 100755
--- a/user_manual/pim/contacts.rst
+++ b/user_manual/pim/contacts.rst
@@ -1,9 +1,11 @@
 Using the Contacts App
 ======================
 
-The contacts app of ownCloud is like any other mobile contact app but with more functionality.
-Just as you open your account you will get the a default addressbook available.
-We will see later that Of course you can always add and remove addressbooks in here.
+The contacts app of ownCloud is like any other mobile contact app but with more
+functionality.  Just as you open your account you will get the a default
+addressbook available.
+We will see later that Of course you can always add and remove addressbooks in
+here.
 
 Adding contacts
 ---------------
@@ -21,26 +23,28 @@ Just below the contact list, click on the gear button:
 
 .. image:: ../images/contact_bottombar.png
 
-Contact settings icon
+   Contact settings icon
 
 Once you've clicked it, an up arrow button which lets you upload files will be shown:
 
 .. image:: ../images/contact_uploadbutton.png
 
-Contact file upload icon
+   Contact file upload icon
 
-After choosing an addressbook to import into, click on the arrow. The upload window will be opened and let you choose your files.
-You can upload the files one by one or upload all of them at one go.
+After choosing an addressbook to import into, click on the arrow. The upload
+window will be opened and let you choose your files.  You can upload the files
+one by one or upload all of them at one go.
 
 Let us demonstrate.
 Open the directory in which you store all the files and then do the following
 Keep pressing CTRL and select the files to upload.
-After you are done just click on the open button
-After the upload it should look something like this in which all the names and contacts will be sorted alphabetically
+After you are done just click on the ``Open`` button.
+After the upload it should look something like this in which all the names and
+contacts will be sorted alphabetically
 
 .. image:: ../images/contact_vcfpick.jpg
 
-Picking VCF files
+   Picking VCF files
 
 After upload, the interface will automatically place your contacts into ownCloud.
 
@@ -48,19 +52,19 @@ After upload, the interface will automatically place your contacts into ownCloud
 Create contacts manually
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
-On the left side of contacts app, you could see the *New Contact* button.
-After clicking on it you can now see an empty contact in the main part of the interface.
-You have the ability to add all your information about the contact:
-the name, the address, the e-mail, the telephone number, etc.
+On the left side of contacts app, you could see the new contact button (first one).
+Click on it. You can now see an empty contact in the main part of the interface.
+You have the ability to add all your informations about the contact:
+the name, the address, the e-mail, the telephone nr, etc.
 
 Just click on a field and start typing the information.
-You can use the "Add field..." button to add another types of information for this contact.
+You can use the "Add Field" button to add another types of information for this contact.
 
 .. image:: ../images/contact_emptycontact.png
 
 Empty contact view
 
-When you want to remove an information of your contact, just click on little trash icon
+When you want to remove an information of your contact, just click on little delete icon
 at the right of the field you want to remove.
 
 Adding picture to the contact
@@ -70,19 +74,19 @@ There are two methods in which you can give a picture id to the specific contact
 
 .. image:: ../images/contact_picture.jpg
 
-Contact picture options
+   Contact picture options
 
 1) **Direct upload**
-2) **Select photos already uploaded in ownCloud files.**
+2) **Select pics already uploaded in ownCloud files.**
 
 After you have selected the picture for the contact you get
 an option to crop the picture to suit your requirements
 
 .. image:: ../images/contact_crop.jpg
 
-Cropping contact picture
+   Cropping contact picture
 
-You can crop the picture however you wish and then press *Crop photo*.
+You can crop the picture however you wish and then press OK.
 
 As you can see it is really easy to set things right in this app.
 It automatically picks up the First name, Middle name (if any) and the last name
@@ -97,7 +101,7 @@ Then, you will be shown all available addressbooks to access the options.
 
 .. image:: ../images/contact_del_ab.png
 
-Addressbook options
+   Addressbook options
 
 There, you have the ability to add, delete, download or share your addressbooks.
 Hover your cursor on every icon to see what they mean.
@@ -113,7 +117,7 @@ You can sync this contact app to your phone which has the following OS's- Androi
 Syncing with Android
 ~~~~~~~~~~~~~~~~~~~~
 
-1) Install CardDAV - Sync free from Google play store by visiting `this link <https://play.google.com/store/apps/details?id=org.dmfs.carddav.sync>`_.
+1) Install CardDAV- Sync free from Google play store by visiting `this link <https://play.google.com/store/apps/details?id=org.dmfs.carddav.sync>`_.
 2) This app supports auto- configuration which is a Boon- after installing visit this link - carddavs://example.org/remote.php/carddav/ to auto-configure the app.
 3) Enter your login details
 4) After the app has checked your login details you may just select- Sync server to phone option
@@ -151,3 +155,9 @@ Other Syncing options provided by ownCloud
 
 1. For Android you may use official Android app which can be found `here <https://owncloud.org/install/>`_.
 2. And for iOS (iPhone and iPad) use their app which can be found `here <https://owncloud.org/install/>`_.
+
+Troubleshooting
+---------------
+
+Are you having problems using the app? Have a look at the :doc:`troubleshooting` guide.
+
diff --git a/user_manual/pim/sync_kde.rst b/user_manual/pim/sync_kde.rst
index 7f05321..2a52827 100644
--- a/user_manual/pim/sync_kde.rst
+++ b/user_manual/pim/sync_kde.rst
@@ -3,9 +3,9 @@ Synchronizing with KDE SC
 
 .. image:: /images/kdes1.png
 
-From KDE SC 4.8 and forward setting up ownCloud is very easy. From
-:menuselection:`System Settings --> Personal Information`, click on *Add*
-and choose *DAV groupware resource* in *Akonadi Resources Configuration* window.
+From KDE SC 4.8 and forward setting up ownCloud is very easy. From System
+Settings Personal Information/Akonadi Resources Configuration select DAV
+Groupware resource.
 
 
 .. image:: ../images/kdes2.png
diff --git a/user_manual/pim/troubleshooting.rst b/user_manual/pim/troubleshooting.rst
index e90c97a..c608b70 100644
--- a/user_manual/pim/troubleshooting.rst
+++ b/user_manual/pim/troubleshooting.rst
@@ -1,6 +1,25 @@
 Troubleshooting
 ===============
 
+Debugging the issue
+-------------------
+
+In a standard ownCloud installation the log level is set to "Normal". to find any issues
+you need to raise the log level to "All" from the Admin page.
+Some logging - for example JavaScript console logging - needs manually editing the
+configuration file.
+Edit :file:`config/config.php` and add ``define('DEBUG', true);``::
+
+    <?php
+    define('DEBUG',true);
+    $CONFIG = array (
+        ... configuration goes here ...
+    );
+
+For JavaScript issues you will also need to view the javascript console. All major browsers
+have decent developer tools for viewing the console, and you usually access them by
+pressing F-12. For Firefox it is recommended to install the `Firebug extension <https://getfirebug.com/>`_.
+
 Service discovery
 -----------------
 
@@ -10,6 +29,9 @@ configured to use it.
 There are several techniques to remedy this, which are described extensively at the
 `Sabre DAV website <http://sabre.io/dav/service-discovery/>`_.
 
+Apple iOS
+`````````
+
 Below is what have proven to work with iOS including iOS 7.
 
 If your ownCloud instance is installed in a sub-folder under the web servers document root, and
@@ -34,3 +56,31 @@ If you use Nginx as web server, the setting looks something like::
 Now change the URL in the client settings to just use ``ADDRESS`` instead of e.g. ``ADDRESS/remote.php/carddav/principals/username``.
 
 This problem is being discussed in the `forum <http://forum.owncloud.org/viewtopic.php?f=3&t=71&p=2211#p2197>`_.
+
+
+BlackBerry OS 10.2
+``````````````````
+
+BlackBerry OS up to 10.2.2102 doesn't accept a URL with protocol ``https://`` in front of the server address.
+It will always tell you, that it cannot login on your server. So instead of writing
+
+    https://address/remote.php/carddav/principals/username
+    
+in the server address field, you have to write
+
+    address/remote.php/carddav/principals/username
+
+
+Unable to update Contacts or Events
+-----------------------------------
+
+If you get an error like ``PATCH https://ADDRESS/some_url HTTP/1.0 501 Not Implemented`` it is
+likely caused by one of the following reasons:
+
+Outdated lighttpd web server
+  lighttpd in debian wheezy (1.4.31) doesn't support the PATCH HTTP verb.
+  Upgrade to lighttpd >= 1.4.33.
+
+Using Pound reverse-proxy/load balancer
+  As of writing this Pound doesn't support the HTTP/1.1 verb.
+  Pound is easily `patched <http://www.apsis.ch/pound/pound_list/archive/2013/2013-08/1377264673000>`_ to support HTTP/1.1.
diff --git a/user_manual/webinterface.rst b/user_manual/webinterface.rst
index 5dcbe2e..251b9f9 100644
--- a/user_manual/webinterface.rst
+++ b/user_manual/webinterface.rst
@@ -1,60 +1,118 @@
-The ownCloud Web Interface 
+The ownCloud Web Interface
 ==========================
 
-You can connect to ownCloud with your web browser by pointing
-it to the address that you have received from your service
-provider. In case you are administering the server yourself,
-have a look at `ownCloud Administrators Manual <http://doc.owncloud.org/server/7.0/admin_manual/>`_.
+You can connect to your ownCloud server using any web browser. To access the ownCloud server using a web browser, specify the uniform resource link (URL) address of the server in the browser navigation bar.  This can be the URL address of your personal ownCloud setup or a URL address that you have received from your company or your service provider.
 
-When you enter the URL, you will receive a page that is similar
-to the one depicted below:
+.. note:: If you are administering the server yourself, we recommend that you read the `ownCloud Administrators Guide <http://doc.owncloud.org/server/6.0/admin_manual/>`_.
+
+Accessing the ownCloud Web Interface
+------------------------------------
+
+To access the ownCloud web interface:
+
+1. Enter the URL address of the ownCloud server into your browser navigation bar.
+
+   The ownCloud login window opens.
 
 .. figure:: images/oc_connect.png
 
-   The ownCloud login screen
-
-Login with the user name and password with you have received from
-your service provider. If you have set up the server yourself,
-log in with the user name which you have created during the
-setup process. You can add further users through the settings,
-or by hooking up a user backend, such as LDAP.
-
-Overview
---------
-
-After clicking the :guilabel:`Log in` button, you will be redirected
-to ownCloud's main web interface:
-
-.. figure:: images/oc_ui.png
-   :align: center
-
-   The ownCloud main interface with the essential elements numbered
-
-The web interface comprises of the following items:
-
-1. **Apps menu**: Allows navigation between different parts of ownCloud,
-   provided by apps. Administrators will also see a button called **Apps**.
-   Using this button allows administrators to enable/disable apps.
-2. **Application view**: This is where apps show their content. By default, this
-   will show the files and directory (file view) of your user on the ownCloud
-   installation.
-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. 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.
-   *Settings* menu provides access to the settings menu, where you can
-   change your personal settings, such as the interface language or your
-   password. You can also retrieve the WebDAV URL (see next chapter) and show
-   your quota. Administrators will also get access to user management
-   (:guilabel:`Users`), the apps settings (:guilabel:`Apps`) and administrative settings (:guilabel:`Admin`)
-   including access to ownCloud's log. You will also find a logout button in this menu.
-5. **App Settings** field will contain various sections to access different views of the app. For example,
-   the files app allows you to see the files *Shared with you* or *Shared with others*.
-   This field may also include a |gear| icon to access to various options provided by the app.
-
-
-.. |gear| image:: images/gear.png
+   **ownCloud login window**
+
+2. Enter your valid username and password.
+
+   The username and password combination can be those that you set up yourself
+   when creating your ownCloud server setup or those provided by your company or
+   your service provider.
+
+   If you have set up the server yourself, or are administering the server, you
+   can add additional users by configuring a user backend (for example, LDAP).
+
+3. Click the :guilabel:`Log in` button.
+
+   The ownCloud main interface opens.
+
+   .. figure:: images/oc_main_web.png
+      :scale: 75%
+
+   **ownCloud main user interface**
+
+
+Navigating the Main User Interface
+------------------------------------
+
+Once you have accessed the ownCloud Server main web interface you can add
+files, remove files, and make changes based on the access privileges set by you
+(if you are administering the server) or by your server administrator.
+
+.. figure:: images/oc_main_web_labelled.png
+   :scale: 75%
+
+The ownCloud Maine User Interface contains the following fields and functions:
+
+* **Apps Selection Menu**: Located in the upper left corner of the user
+  interface, this bar contains apps that are configured on the ownCloud server.
+  The icons in this bar enable you to launch the different apps available and
+  navigate between them within the ownCloud user interface.
+
+.. note:: ownCloud supports a number of apps that can be installed and used for
+   various features and functions.  Not all apps are installed and enabled by
+   default.  For example, the :guilabel:`Apps` button is visible only to
+   administrators.  This button allows administrators to enable or disable
+   installed applications.
+
+* **Apps Information** field: Located in the left side bar, this field provides
+  filters and tasks associated with the chosen app.  For example, using the
+  Files app, you can use the filters in the apps information field to view only
+  files that have been shared with you, files that you have shared with others,
+  files that you have shared through the use of a link, or an option to delete
+  files.  Other app-specific information fields might provide tasks for creating
+  new documents or modifying calendar entries.
+
+* **Application View**: The main, central field in the ownCloud user interface.
+  This field displays the contents or user features of the app selected in the
+  Navigation Bar.  By default, this field shows the files and directory
+  ("Files" view) of your user account.
+
+* **Navigation Bar**: Located over the main viewing window (the Application
+  View), this bar provides a type of breadcrumbs navigation that enables you to
+  migrate to higher levels of the folder hierarchy up to the root level (home) of
+  your ownCloud instance.
+
+* **New** button: Located in the Navigation Bar, the :guilabel:`New` button
+  ebables you to create new files, new folders, or upload existing files from a
+  specified link.
+
+.. note:: You can also drag and drop files from Windows Explorer or your MAC
+   OSX Finder into the ownCloud Files Application View to upload them to ownCloud.
+
+* **Upload** button: Located next to the :guilabel:`New` button in the
+  Navigation Bar, the :guilabel:`Upload` button enables you to upload files
+  from your system to the ownCloud server.  Clicking this button launches a
+  Windows Explorer or MAC OSX Finder window with which you can choose files for
+  uploading.
+
+* **Search** field: Residing in the upper right hand corner of the Main User
+  Interface window, the Search field enables you to search for files and
+  folders stored in ownCloud. The ownCloud search function provides a full text
+  search. However, for searching to function, administrators must enable the app
+  in the search app settings.
+
+* **Personal Settings** menu: Located to the right of the Search field, the
+  Personal Settings dropdown menu provides access to your personal settings
+  page and the ability to log out of your ownCloud user session.  The personal
+  settings page provides access to the following:
+
+  * Server usage and space availability
+  * Password management
+  * Name, email, and profile picture settings
+  * Interface language settings
+  * WebDAV URL for receiving files using WebDAV (see next chapter).
+  * Mozilla Sync information for creating a synchronization to a Mozilla (Firefox) account.
+  * ownCloud Version information
+
+In addition to these standard settings, administrators have access to user
+management (:guilabel:`Users`), apps settings (:guilabel:`Apps`), and
+administrative settings (:guilabel:`Admin`) including access to the ownCloud
+log files.
+
+

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



More information about the Pkg-owncloud-commits mailing list