Merge pull request #560 from owncloud/rework_user

rework_user manual and include #369

user_manual/files/sync.rst

@@ -13,7 +13,7 @@ have your latest files with you wherever you are.
 
 Its usage is documented separately in the `ownCloud Desktop Client Manual`_.
 
-Furthermore, It is possible to synchronize your ownCloud calendar and address book
+Furthermore, it is possible to synchronize your ownCloud calendar and your address book
 with a variety of different operating systems and devices. It is also possible to
 mount your ownCloud storage via WebDAV, which is also documented in the next chapters.
 

user_manual/files/versioncontrol.rst

@@ -32,5 +32,5 @@ The versions are adjusted along this pattern every time a new version gets
 created.
 
 Beside that the version app takes care to never use more that 50% of the users
-currently available free space. If the stored versions exceed this limit ownCloud
-delete the oldest versions until it meets the memory usage limit again.
+currently available free space. If the stored versions exceed this limit, ownCloud
+deletes the oldest versions until it meets the disk space limit again.

user_manual/pim/calendar.rst

@@ -122,7 +122,7 @@ The following is an example showing the completed URL where the calendar name is
 
        https://localhost/owncloud/remote.php/caldav/calendars/test/defaultcalendar
 
-.. Note: Calendar names are lower case and any spaces are removed. They are not
+.. Note: Calendar names are lowercase and any spaces are removed. They are not
   URL-encoded.
 
 Creating Events

user_manual/pim/contacts.rst

@@ -191,7 +191,7 @@ two following ways:
   and clicking ``Open``.
   
 - Select image from Files -- By selecting this option, ownCloud opens the Files
-  app on the ownCloud server.  You can choose an image by navigating to the image
+  dialog on the ownCloud server.  You can choose an image by navigating to the image
   in the ownCloud directory, selecting it, and clicking ``Choose.``
 
 Cropping an Avatar Image

user_manual/pim/sync_ios.rst

@@ -15,7 +15,7 @@ Calendar
 #. If your server does not support SSL, a warning will be displayed.
    Select Continue.
 #. If the iPhone is unable to verify the account information perform the
-   following:
+   following steps:
 
    -  Select OK.
    -  Select advanced settings.
@@ -23,7 +23,7 @@ Calendar
    -  Change port to 80.
    -  Go back to account information and hit Save.
 
-Your calendar should now be visible in the Calendar application
+Your calendar will now be visible in the Calendar application
 
 
 Address book
@@ -50,4 +50,4 @@ Address book
 
 Now should now find your contacts in the address book of your
 iPhone.
-If it's still not working, have a look at the :doc:`troubleshooting` guide.
+If it's still not working, have a look at the :doc:`troubleshooting` guide.

user_manual/pim/sync_thunderbird.rst

@@ -29,8 +29,16 @@ which will display the URL you need for your installation to work.
 
 .. image:: ../images/contact_thunderbird-URL_config.jpg
 
-Once installed, synchronize (right click on your newly made remote addressbook and select "Synchronize"). You'll see your addressbook populate from ownCloud! Don't click "read only" above unless you don't want to modify your ownCloud server addressbook, like it contains a listing of corporate contacts and is shared with lots of people, and you don't want a new user dragging it somewhere unintended.
+Once installed, synchronize (right click on your newly made remote address book and select "Synchronize").
+You'll see your address book populate from ownCloud! Don't click "read only" above unless you don't want to
+modify your ownCloud server addressbook, like it contains a listing of corporate contacts and is shared with
+lots of people, and you don't want a new user dragging it somewhere unintended.
 
-The rest of the details of dealing with Thunderbird addressbook are left to the reader... First thing I learned is dragging a contact to a different addressbook is a "move" operation. If you are worried about losing the contact, save it to a VCF file using ownCloud (Or LDIF using Thunderbird Addressbook) first! Like dragging from "ownCloud Addressbook" to "Personal Address Book" removes the contact from ownCloud Server (*deleting it from all the other synchronized installations*) and puts it in your Local Machine -only- Addressbook. So be careful or you'll have unintended consequences where you might have intended a "copy" operation.
+The rest of the details of dealing with Thunderbird addressbook are left to the reader... First thing I learned
+is dragging a contact to a different addressbook is a "move" operation. If you are worried about losing the
+contact, save it to a VCF file using ownCloud (Or LDIF using Thunderbird Addressbook) first! Like dragging
+from "ownCloud Addressbook" to "Personal Address Book" removes the contact from ownCloud Server
+(*deleting it from all the other synchronized installations*) and puts it in your Local Machine -only-
+Address Book. So be careful or you'll have unintended consequences where you might have intended a "copy" operation.
 
 Contact *Pictures* are also sync'ed!

user_manual/pim/troubleshooting.rst

@@ -34,7 +34,7 @@ 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
+If your ownCloud instance is installed in a subfolder under the web server's document root and
 the client has difficulties finding the Cal- or CardDAV end-points, configure your web server to
 redirect from a "well-know" URL to the one used by ownCloud.
 When using the Apache web server this is easily achieved using a :file:`.htaccess` file in the document
@@ -61,7 +61,7 @@ This problem is being discussed in the `forum <http://forum.owncloud.org/viewtop
 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.
+BlackBerry OS up to 10.2.2102 does not 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