Merge pull request #491 from owncloud/updates-fixes

Some spelling and instruction fixes

user_manual/files/deletedfiles.rst

@@ -26,7 +26,7 @@ To restore a deleted file:
 
    .. figure:: ../images/deleted_files.png
 
-   **Deleted files**
+       **Deleted files**
 
 2. Hover the cursor over the file that you want to restore.
 

user_manual/files/filesweb.rst

@@ -7,18 +7,18 @@ move, rename, download, share, and delete your files easily.
 
 .. figure:: ../images/oc_filesweb.png
 
-**ownCloud web interface Files app**
+    **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:
 
-* :guilabel:`Rename` -- Enables you to rename a file or folder.
+* :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:`Delete` -- Deletes the selected file or folder.
+* :guilabel:`Trash icon` -- Deletes the selected file or folder.
 
 
 Navigating Inside Your ownCloud
@@ -31,7 +31,7 @@ the Files field for quick navigation.
 
 .. figure:: ../images/oc_filesweb_navigate.png
 
-**Navigation bar**
+    **Navigation bar**
 
 The navigation bar functions as a "breadcrumb" locator.  It indicates your
 current directory and enables you to migrate back to one of the upper
@@ -46,7 +46,7 @@ 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:
 
@@ -146,8 +146,8 @@ To share a file or folder:
 
 		.. 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.
+  * **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
+    .. figure:: ../images/oc_share_expiration_calendar.png
 
-		**Expiration Date Calendar**
+	**Expiration Date Calendar**

user_manual/files/quota.rst

@@ -6,8 +6,8 @@ ownCloud enables you to specify a storage quota for users which is the
 individual home storage.
 
 .. 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
+   metadata. Application metadata 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 Available Space
@@ -88,7 +88,7 @@ like the :doc:`calendar <../pim/calendar>` and :doc:`contacts
 <../pim/contacts>` apps. This data is also excluded from the total used space.
 
 
-Deleted files
+Deleted Files
 ~~~~~~~~~~~~~
 
 When deleting files, these are moved/copied to the :doc:`trashbin

user_manual/files/server_to_server_using.rst

@@ -38,7 +38,7 @@ To share a file or folder across servers as an originator:
 
    .. figure:: ../images/share_link.png
 
-   **Sharing a link**
+      **Sharing a link**
 
 3. (Optional) Specify an alphanumeric password that you want others to use in order to accessing this share.
 

user_manual/webinterface.rst

@@ -25,7 +25,7 @@ To access the ownCloud web interface:
    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
+   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.
@@ -33,7 +33,7 @@ To access the ownCloud web interface:
    The ownCloud main interface opens.
 
    .. figure:: images/oc_main_web.png
-      :scale: 60%
+      :scale: 90%
 
    **ownCloud main user interface**
 
@@ -45,11 +45,11 @@ 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: 60%
+   :scale: 90%
 
 **Navigating the main user interface**
 
-The ownCloud Maine User Interface contains the following fields and functions:
+The ownCloud Main 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.
@@ -80,17 +80,17 @@ The ownCloud Maine User Interface contains the following fields and functions:
   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
+  enables 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.
+.. note:: You can also drag and drop files from your file manager (e.g. Windows Explorer
+   or your Mac OS X 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.
+  file picker (e.g. Windows Explorer or Mac OS X 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
@@ -111,6 +111,8 @@ The ownCloud Maine User Interface contains the following fields and functions:
   * Mozilla Sync information for creating a synchronization to a Mozilla (Firefox) account.
   * ownCloud Version information
 
+  You can see :doc:`userpreferences` section to learn more about those settings.
+
 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