Merge pull request #218 from wakeup/stable6updated

User manual updated to version 6

user_manual/bookmarks.rst

@@ -9,17 +9,18 @@ The main interface
 
 Add a bookmark
 ~~~~~~~~~~~~~~
-
-The main ownCloud interface contains 3 fields at the top where
+In bookmark application, enter a URL into the top-left area of the content section. After adding an address, you can click on pencil button to edit fields for the given address.
+The main ownCloud bookmark interface contains 3 fields at the top where
 you can enter the website address (or URL), the title of your bookmark and
 a set of tags separated from each other by a space.
 
-.. figure:: images/bookmark_addurl.jpg
+.. figure:: images/bookmark_addurl.png
+Adding a bookmark manually
 
-In this example, we have added the page : http://wikipedia.org with the title "Wikipedia"
+In this example, we have added the page: `http://wikipedia.org` with the title "Wikipedia"
 and some tags describing what Wikipedia is (for an easier search later on).
 
-Edit/delete a bookmark
+Edit/Delete a bookmark
 ~~~~~~~~~~~~~~~~~~~~~~
 
 You also have the possibility to edit or delete your bookmark.
@@ -44,7 +45,8 @@ the default view.
 The bookmarklet
 ---------------
 
-.. figure:: images/bookmark_setting.jpg
+.. figure:: images/bookmark_setting.png
+Bookmarklet link
 
 The creator of this app understand that people won't come,
 open the ownCloud page to add the bookmark when the see a cool site.
@@ -54,7 +56,6 @@ A bookmarklet is small button that you can drag and drop in your bookmarks.
 The next time you see a cool new site, press on this special bookmark,
 it will add the site to your ownCloud bookmarks.
 
-To find this bookmark go to your personal preferences and search for
-the "Bookmarklet" item.
+To find this bookmark click on gear button on the bottom area of bookmarks app.
 
 

user_manual/contents.rst

@@ -16,7 +16,9 @@ ownCloud documentation contents
     files/index
     pim/index
     bookmarks
+    documents
     migration
+    userpreferences
     external_storage/google_drive
 
 

user_manual/documents.rst

@@ -0,0 +1,71 @@
+Documents
+=========
+
+Document editing is one of the new features in ownCloud 6. With this app, multiple users
+can edit a rich-text simultaneously. The documents can be created from within the
+web-interface or existing documents can be uploaded. Sharing and editing can be done
+securely in the browser and be shared inside ownCloud or via a public link. User that
+have an account on the same server can be invited or public invitations can also be
+sent be email. The editing works on top of normal ODF files that are stored in ownCloud.
+
+The main interface
+------------------
+
+.. figure:: images/oc_documents.png
+
+Create/Upload a document
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+In documents application, click on appropriate buttons to create or upload a document into your ownCloud. *New document* button will create a document named "New document.odt". The extension ODT is an OpenDocument format which many major office applications let you create/edit/view.
+
+Upload button allows you to upload any kind of documents, but currently you can only edit ODT files using ownCloud.
+
+Edit a document
+~~~~~~~~~~~~~~~
+
+If you have at least one ODT file in your ownCloud, you can immediately start editing by clicking on
+the file in documents app. Clicking on documents in files app will only display it. Below, you
+can see editing a newly created document file:
+
+.. figure:: images/oc_documents_edit.png
+
+Here is the explanation of each field in the image shown above:
+
+#. Clicking on the file name allows you to change filename.
+#. Allows you to share the document to public, specific users or groups. Will be explained in detail in :ref:`Share a document <share-a-document>` section.
+#. Formatting toolbar lets you change text styles.
+#. Zoom in/out
+#. Close document by saving changes
+#. Users who currently editing this document
+
+Collaboratively editing a document
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To edit a file collaboratively, it needs to be shared with at least one user by using *Share* button. When a user had the permission to edit the document, he/she will be able to edit it at the same time with you. The cursor of the users will be the same color as the border color of their user picture.
+
+.. figure:: images/oc_documents_col_edit.png
+
+If a user is not a local user (e.g accessing the file using public link), he/she will be shown as guest in user list and they will type a nickname before editing.
+
+
+Delete a document
+~~~~~~~~~~~~~~~~~
+
+A document can be deleted by using files app and following the same procedure as the other files. Using the cross icon deletes the selected document.
+
+.. _share-a-document:
+
+Share a document
+~~~~~~~~~~~~~~~~
+
+Document sharing has the same options as sharing other files with other users. While editing the document, you can use *Share* button to enable editing the document by another users. This button will display all available options to share:
+
+.. figure:: images/oc_documents_share.png
+
+By default, you can enter local users or groups to share with. Clicking on *Share link* will enable public share then which you can set a password to protect editing from unwanted users. Shares can also have an expiration date which will expire the link after given date. The public link can be sent to multiple users by email by typing email addresses seperated with space into email field.
+
+To see all features of ownCloud document app, you can watch the video below:
+
+.. raw:: html
+
+        <iframe width="420" height="315" src="http://www.youtube.com/embed/70pCBnNPdew" frameborder="0" allowfullscreen></iframe>

user_manual/files/configuring_big_file_upload.rst

@@ -8,4 +8,4 @@ As a default, PHP is configured for only 2 MB uploads.
 This is not entirely useful, so it is important to increase these variables to the sizes you want to
 support on your server.
 Ask your administrator to increase these variables for you or read the section in concern `within the
-Admin Documentation. <http://doc.owncloud.com/server/5.0EE/admin_manual/configuration/configuring_big_file_upload.html>`_
+Admin Documentation <http://doc.owncloud.org/server/6.0/admin_manual/configuration/configuring_big_file_upload.html>`_.

user_manual/files/deletedfiles.rst

@@ -8,6 +8,9 @@ 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 *Deleted files* button on files app of web interface.
+You can either restore or permanently delete using appropriate buttons.
+
 Beside that ownCloud checks the age of the files every time a new files gets moved
 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

user_manual/files/files.rst

@@ -221,7 +221,7 @@ Solution
 Sync Client
 -----------
 However, some applications only allow you to save to a local folder. To
-get around this issue, you can use the :doc:`ownCloud sync clients <../files/index>`
+get around this issue, you can use the `ownCloud sync clients`_
 
 Mobile
 -------
@@ -241,13 +241,13 @@ The URL for these is::
     youraddress.com/owncloud/remote.php/webdav
 
 .. _in your file manager: http://en.wikipedia.org/wiki/Webdav#WebDAV_client_applications
-.. _Sync your ownCloud folders and local folders: http://owncloud.org/documentation/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://gitorious.org/owncloud/mirall
-.. _Android: http://gitorious.org/owncloud/android
-.. _webOS: http://gitorious.org/owncloud/webos
+.. _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: http://market.android.com/details?id=com.schimera.webdavnavlite
-.. _iPhone: http://itunes.apple.com/app/webdav-navigator/id382551345
-.. _BlackBerry: http://appworld.blackberry.com/webstore/content/46279
+.. _Android App: https://play.google.com/store/apps/details?id=com.schimera.webdavnavlite
+.. _iPhone: https://itunes.apple.com/app/webdav-navigator/id382551345
+.. _BlackBerry: http://appworld.blackberry.com/webstore/content/46816

user_manual/files/filesweb.rst

@@ -0,0 +1,50 @@
+Accessing your Files (Web Interface)
+====================================
+
+Your ownCloud files can be accessed from anywhere by using your ownCloud web interface. In files app,
+you can view (if a common type), 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.
+
+.. figure:: ../images/oc_filesweb.png
+Files app on ownCloud web interface
+
+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.
+
+
+
+Selecting files
+---------------
+
+You can select one or more files by clicking on small thumbnails or icons of the files. To select all files in
+the current directory, use the checkbox under New button.
+
+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.
+
+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.
+
+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 filenames.
+
+To share a file/folder, hover your cursor on an item in files app and click *Share*. You will be provided with some options:
+
+.. figure:: ../images/oc_files_share.png
+Share dialog
+
+* 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 collegue.
+* 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 also will 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 seperated with space to send the link to multiple users.
+* Finally, setting an expiration date will expiry the share after the specified date.

user_manual/files/index.rst

@@ -5,6 +5,7 @@ Files & Synchronization
 .. toctree::
    :maxdepth: 1
 
+   filesweb
    files
    versioncontrol
    deletedfiles

user_manual/files/sync.rst

@@ -1,4 +1,4 @@
-Desktop Synchronisation
+Desktop Synchronization
 ========================
 
 For synchronizing files with your desktop computer, we recommend using the
@@ -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.com/desktop/1.2/
+.. _ownCloud Desktop Client Manual:  http://doc.owncloud.com/desktop

user_manual/files/versioncontrol.rst

@@ -1,13 +1,23 @@
 Version Control
 ===============
 
-ownCloud supports simple version control for files. Versioning is
-enabled by default, and creates backups of files which are accessible
-via the history tab. This tab also links to the history page, where you
-can roll back a file to any previous version. Changes made at intervals
-greater than two minutes are saved in data/[user]/versions, and made
-accessible using the above pages.
+ownCloud supports simple version control for files. Versioning creates backups
+of files which are accessible via the Versions link. This link contains the
+history of the file where you can roll back a file to any previous version. Changes
+made at intervals greater than two minutes are saved in data/[user]/versions,
+and made accessible using the above pages.
 
+Versioning is **not** enabled by default and needs to be enabled by administrator
+using App management page.
+
+To restore a specific version of a file, hover your cursor on a file and click
+*Versions* link. If any version is available, you should see a list like the image
+below:
+
+.. figure:: ../images/files_versioning.png
+
+Clicking on *Restore* next to any version will revert the file to that
+version back.
 
 The versioning app expires old versions automatically to make sure that
 the user doesn't run out of space. Following pattern is used to delete

user_manual/images/oc_ui.svg

@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.1"
-   width="1067"
-   height="698"
-   id="svg2894">
-  <defs
-     id="defs2898" />
-  <image
-     xlink:href="file:///Users/danimo/dev/documentation/user_manual/images/oc_files.tiff"
-     x="0"
-     y="0"
-     width="1067"
-     height="698"
-     id="image2904" />
-  <path
-     d="m 725.00002,428.14706 a 53.676472,53.676472 0 1 1 -107.35294,0 53.676472,53.676472 0 1 1 107.35294,0 z"
-     id="path2912"
-     style="fill:#1d2d44;fill-opacity:1;stroke:#1d2d44;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-  <path
-     d="m 461.76471,204.61765 a 24.264706,24.264706 0 1 1 -48.52942,0 24.264706,24.264706 0 1 1 48.52942,0 z"
-     transform="matrix(1.2619325,0,0,1.2619325,237.61043,-145.50778)"
-     id="path3686"
-     style="fill:#ffffff;fill-opacity:1;stroke:#1d2d44;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-  <path
-     d="m 355.88234,141.38235 a 28.67647,28.67647 0 1 1 -57.35294,0 28.67647,28.67647 0 1 1 57.35294,0 z"
-     transform="translate(-8.8235294,-4.4117647)"
-     id="path3688"
-     style="fill:#ffffff;fill-opacity:1;stroke:#1d2d44;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-  <rect
-     width="163.23529"
-     height="261.76471"
-     x="-1.4705882"
-     y="155.35294"
-     id="rect3784"
-     style="opacity:0.54918033;fill:#ffffff;fill-opacity:1;stroke:#1d2d44;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-  <g
-     transform="translate(-5.8823529,-263.23529)"
-     id="g3817">
-    <path
-       d="m 122.05883,552.41174 a 39.705883,39.705883 0 1 1 -79.41177,0 39.705883,39.705883 0 1 1 79.41177,0 z"
-       transform="translate(-4.4117647,-2.9411694e-8)"
-       id="path2910"
-       style="fill:#1d2d44;fill-opacity:1;stroke:#1d2d44;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <text
-       x="65.647057"
-       y="566.5882"
-       id="text3813"
-       xml:space="preserve"
-       style="font-size:40px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
-         x="65.647057"
-         y="566.5882"
-         id="tspan3815">1</tspan></text>
-  </g>
-  <text
-     x="659.35291"
-     y="441.05881"
-     id="text3822"
-     xml:space="preserve"
-     style="font-size:40px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
-       x="659.35291"
-       y="441.05881"
-       id="tspan3824">2</tspan></text>
-  <text
-     x="305.35294"
-     y="150.94118"
-     id="text3826"
-     xml:space="preserve"
-     style="font-size:40px;font-style:normal;font-weight:normal;fill:#1d2d44;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
-       x="305.35294"
-       y="150.94118"
-       id="tspan3828">3</tspan></text>
-  <text
-     x="776.47058"
-     y="125.94117"
-     id="text3830"
-     xml:space="preserve"
-     style="font-size:40px;font-style:normal;font-weight:normal;fill:#1d2d44;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
-       x="776.47058"
-       y="125.94117"
-       id="tspan3832">4</tspan></text>
-  <rect
-     width="154.41176"
-     height="26.470589"
-     x="2.9411764"
-     y="670.05884"
-     id="rect3834"
-     style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke:#1d2d44;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-  <text
-     x="100"
-     y="617.11768"
-     id="text3836"
-     xml:space="preserve"
-     style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
-       x="100"
-       y="617.11768"
-       id="tspan3838" /></text>
-  <path
-     d="m 124.25,659.625 a 25.875,27.125 0 1 1 -51.75,0 25.875,27.125 0 1 1 51.75,0 z"
-     id="path3874"
-     style="fill:#1d2d44;fill-opacity:1;stroke:#1d2d44;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-  <text
-     x="86.4375"
-     y="673.25"
-     id="text3876"
-     xml:space="preserve"
-     style="font-size:40px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
-       x="86.4375"
-       y="673.25"
-       id="tspan3878">5</tspan></text>
-</svg>

user_manual/index.rst

@@ -40,6 +40,11 @@ Contacts & Calendar web interface, export, import and synchronization.
 * :doc:`pim/sync_kde`
 * :doc:`pim/sync_osx`
 
+Documents
+=========
+Documents allows users collaboratively edit rich-text documents at the same time.
+* :doc:`documents`
+
 Bookmarks
 =========
 Web interface for managing your bookmarks.

user_manual/pim/calendar.rst

@@ -5,15 +5,15 @@ Creating a calendar
 -------------------
 
 .. figure:: ../images/calendar_manage-calendars.png
-   :scale: 30
+Calendar view
 
 If you use the calendar the first time, there will be already a calendar called
 "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.
+link for CalDAV access.
 
-Synchronising Calendars with CalDav
+Synchronising Calendars with CalDAV
 -----------------------------------
 
 Assuming you access your web interface via an address like this::
@@ -51,7 +51,7 @@ timeframe in the weekview. In the dialog which will appear you can enter your
 information like title, category, etc.
 
 .. figure:: ../images/calendar_createevent.png
-   :scale: 50
+New event window
 
 With the advanced options you can set the
 description, the location and the repetition rate of an event. If the repeating
@@ -67,7 +67,7 @@ Export
 ~~~~~~
 
 .. figure:: ../images/calendar_export.png
-   :scale: 50
+Exporting an event
 
 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
@@ -78,7 +78,7 @@ Import
 ~~~~~~
 
 .. figure:: ../images/calendar_import.png
-   :scale: 50
+Importing events
 
 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
@@ -91,7 +91,7 @@ Why is the calendar app asking for my current location?
 -------------------------------------------------------
 
 .. figure:: ../images/calendar_newtimezone1.png
-   :scale: 50
+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

user_manual/pim/contacts.rst

@@ -17,40 +17,44 @@ Importing
 
 So first we'll check out how to import all the VCF files as they are a lot
 more faster way of creating contacts.
-Just below the contact list, 3 buttons: The middle one let you upload files.
+Just below the contact list, click on the gear button:
 
-.. image:: ../images/contact_bottombar.jpg
+.. image:: ../images/contact_bottombar.png
+Contact settings icon
 
+Once you've clicked it, an up arrow button which lets you upload files will be shown:
 
-Once you've clicked it, the upload window let you choose your files.
-We can upload the files one by one or upload all of them at one go.
+.. image:: ../images/contact_uploadbutton.png
+Contact file upload icon
 
-Let me demonstrate.
+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
 
 .. image:: ../images/contact_vcfpick.jpg
+Picking VCF files
 
-Then, the interface ask you where to put your imported contacts.
-You have the ability to choose an existing addressbook or to create a new one.
-Then click on "OK" and that's all for the import of contacts.
+After upload, the interface will automatically place your contacts into ownCloud.
 
-.. image:: ../images/contact_import.jpg
 
 Create contacts manually
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
-In the picture of the bottom bar, you could see the new contact button (first one).
+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, ...
+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.
 
-.. image:: ../images/contact_emptycontact.jpg
+.. image:: ../images/contact_emptycontact.png
+Empty contact view
 
 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.
@@ -58,10 +62,10 @@ at the right of the field you want to remove.
 Adding picture to the contact
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-
 There are two methods in which you can give a picture id to the specific contact
 
 .. image:: ../images/contact_picture.jpg
+Contact picture options
 
 1) **Direct upload**
 2) **Select pics already uploaded in ownCloud files.**
@@ -70,37 +74,40 @@ 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
 
 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
 You may add or delete any section you want for your own convenience.
 
-Creating new address books
+Creating new addressbooks
 --------------------------
 
-When you click on the third button of the bottom bar,
+When you click on settings button on bottom bar,
 you will have access to the application's settings.
-Then, press on the "More button" to access the options of your addressbooks.
+Then, you will be shown all available addressbooks to access the options.
 
-.. image:: ../images/contact_del_ab.jpg
+.. image:: ../images/contact_del_ab.png
+Addressbook options
 
-You have there the ability to add, delete, download or share your addressbooks.
+There, you have the ability to add, delete, download or share your addressbooks.
 Hover your cursor on every icon to see what they mean.
 
 
-Keeping your address book in sync
+Keeping your addressbook in sync
 ---------------------------------
+
 One of the most important thing in any contact app is to keep it in Sync.
 You can sync this contact app to your phone which has the following OS's- Android and iOS
 
 
 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
-2) This app supports auto- configuration which is a Boon- after installing visit this link- carddavs://owncloud.example.net/remote.php/carddav/  to auto configure the app.
+
+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://youraddress.com/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
 5) That's it there is nothing else to do for Android :)
@@ -117,7 +124,7 @@ Synchronizing the Address book
 3. Select Add Account.
 4. Select other as account type.
 5. Select Add CardDAV account.
-6. For server, type http://owncloud.example.net/remote.php/carddav/principals/username
+6. For server, type http://youraddress.com/remote.php/carddav/principals/username
 7. Enter your user name and password.
 8. Select Next.
 9. If your server does not support SSL, a warning will be displayed. Select Continue.
@@ -129,11 +136,11 @@ Synchronizing the Address book
 * Change port to 80.
 * Go back to account information and hit Save.
 
-Now should now find your contacts in the address book of your iPhone
+Now should now find your contacts in the address book of your iPhone.
 
 
 Other Syncing options provided by ownCloud
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-1. For android you may use their official android app-  https://owncloud.com/overview/mobileapps
 
-2. And for iOS (iPhone and iPad) use their app - https://owncloud.com/overview/mobileapps
+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/>`_.

user_manual/pim/sync_osx.rst

@@ -1,14 +1,16 @@
 Synchronizing with OS X
 =======================
 
-To use ownCloud with iCal you will need to use the following URL: http://ADDRESS/remote.php/caldav/principals/username/
+To use ownCloud with iCal you will need to use the following URL::
+
+    http://ADDRESS/remote.php/caldav/principals/username/
 
 The setup is basically the same as with iOS using the path **ADDRESS/remote.php/caldav/principals/username/** to sync with ownCloud. For OS X 10.7 Lion and 10.8 Mountain Lion everything works fine, but OS X 10.6 (Snow Leopard) and older needs some fiddling to work. A user contributed the following:
 
-#. Make sure, Addressbook is not running. If it is, select the windows and press Command + Q to terminate it.
-#. Navigate to **/Users/YOUR\_USERNAME/Library/Application Support/AddressBook/Sources**. If you have all ready some kind of address book setup, it is likely you will see some folders named like this **BEA92826-FBF3-4E53-B5C6-ED7C2B454430**. Note down what folders there are now and leave the window open.
-#. Open addressbook and try to add a new CardDav addressbook. At this point, it does not matter what information you enter. It will come up with the same error message you mentioned before when you click "Create". Ignore it and click "Create" again. A non-functional address book will be added.
-#. Close Address-Book again using Command + Q
+#. Make sure, addressbook is not running. If it is, select the windows and press Command + Q to terminate it.
+#. Navigate to **/Users/YOUR\_USERNAME/Library/Application Support/AddressBook/Sources**. If you have all ready some kind of addressbook setup, it is likely you will see some folders named like this **BEA92826-FBF3-4E53-B5C6-ED7C2B454430**. Note down what folders there are now and leave the window open.
+#. Open addressbook and try to add a new CardDav addressbook. At this point, it does not matter what information you enter. It will come up with the same error message you mentioned before when you click "Create". Ignore it and click "Create" again. A non-functional addressbook will be added.
+#. Close addressbook again using Command + Q
 #. Go back to the folder window from step 2. You will now see a newly created folder with another long string as its name.
 #. Navigate to the newly created folder and edit the **Configuration.plist** with your favorite text editor.
 #. Search for a section looking like this::
@@ -19,11 +21,11 @@ The setup is basically the same as with iOS using the path **ADDRESS/remote.php/
 
     <key>servername</key <string>http://YOUR_DOMAIN:80/owncloud/remote.php/carddav/principals/username</string> <key>username</key <string>username</string>
 
-9. Save the file and open Address Book again. It will not work yet.
+9. Save the file and open addressbook again. It will not work yet.
 
 10. Open the preferences for your ownCloud CardDAV-Account and enter your password.
 
-11. You may have to restart Address Book once more. After this, it should work.
+11. You may have to restart addressbook once more. After this, it should work.
 
 If it's still not working, have a look at the :doc:`troubleshooting` guide.
 

user_manual/pim/sync_thunderbird.rst

@@ -1,13 +1,13 @@
-Thunderbird - Synchronize Address Book
+Thunderbird - Synchronize Addressbook
 ======================================
 
-Address book
+Addressbook
 ------------
 
-As someone who is new to ownCloud, New to SoGo Connector, and new to Thunderbird Addressbook... here is what you need in excruciating pithy detail I needed to make this work (for all the other lost souls out there).
+As someone who is new to ownCloud, New to SoGo Connector, and new to Thunderbird Addressbook... here is what you need in excruciating pithy detail you need to make this work (for all the other lost souls out there):
 
-1. `<http://www.mozilla.org/en-US/thunderbird/>`__ **Thunderbird** for your OS unless it comes with your OS distribution (Linux) 
-#. `<http://www.sogo.nu/english/downloads/frontends.html>`__ **Sogo Connector** (latest release)
+#. `Thunderbird <http://www.mozilla.org/en-US/thunderbird/>`_ for your OS unless it comes with your OS distribution (Linux)
+#. `Sogo Connector <http://www.sogo.nu/english/downloads/frontends.html>`_ (latest release)
 
  With an installed Thunderbird mailtool, and installed SoGo Connector:
 #. Thunderbird Addressbook is in the Thunderbird "Tools" Menu
@@ -15,7 +15,8 @@ As someone who is new to ownCloud, New to SoGo Connector, and new to Thunderbird
 
    -  "File > New > **Remote Addressbook**" (SoGo Connector added this)
    -  "**Name:**" is the name you want to give your Addressbook in the Thunderbird addressbook bar area
-   -  "**URL:**" is found in your OwnCloud Contacts area, that little Gear symbol 
+   -  "**URL:**" is found in your OwnCloud Contacts area, that little Gear symbol
+
 .. image:: ../images/contact_thunderbird-Symbol_Gear.jpg
 in the -bottom left- of the Contacts View (same symbol as found in the -top right- in the Calendar view). Then look for a little impeller symbol
 
@@ -23,7 +24,6 @@ in the -bottom left- of the Contacts View (same symbol as found in the -top righ
 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.
 

user_manual/userpreferences.rst

@@ -0,0 +1,31 @@
+Changing Preferences
+====================
+
+.. figure:: images/oc_user_preferences.png
+
+As a user, you can change your personal settings by clicking on your username
+on the top-right of ownCloud instance and choosing *Personal*.
+
+If you are an administrator, you can also manage users and administer the server
+by using the related links. Those links will not be shown to a normal user.
+
+This document will explain the default items on this page. Depending on the enabled
+applications, you may have more options listed.
+
+* In the beginning of the page, you will see your usage and available quota.
+
+* You can change your password. For that, you need to enter your current and new password in the field
+  named *Password*. If you would like to able to recover your password via e-mail, fill the e-mail field
+  with the one that you currently using.
+
+* By default, your image will have the initial of your username. This image is currently used in editing documents.
+  You can either upload a new image or choose one from the existing images on your ownCloud to set.
+
+* In this page, you can also change your web interface language if you want to override the browser settings.
+
+* WebDAV link will allow you to only view and download your ownCloud files using a browser. You will still need
+  your username and password to access this page.
+
+* Documents app will have an option to specify the folder for newly created documents. You can set the folder here.
+
+* This page will have more options if you have e.g. external storage app enabled.

user_manual/webinterface.rst

@@ -4,13 +4,12 @@ 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.
+have a look at `ownCloud Administrators Manual <http://doc.owncloud.org/server/6.0/admin_manual/>`_.
 
 When you enter the URL, you will receive a page that is similar
 to the one depicted below:
 
 .. figure:: images/oc_connect.png
-   :scale: 50
 
    The ownCloud login screen
 
@@ -27,29 +26,29 @@ After clicking the :guilabel:`Log in` button, you will be redirected
 to ownCloud's main web interface:
 
 .. figure:: images/oc_ui.png
-   :scale: 50
+   :align: center
 
    The ownCloud main interface with the essential elements numbered
 
 The web interface comprises of the following items:
 
 1. **Navigation bar**: Allows navigation between different parts of ownCloud,
-   provided by apps. Not all apps depicted in this screen shot are installed
+   provided by apps. Not all apps depicted in this screenshot are installed
    and enabled by default.
 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. **Upload/Create button**: This allows you to create new files or upload
+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.
-4. **Search/Logout**: Search allows you to look for files and
-   directories. Currently, ownCloud does not provide a full text search, but
-   this may change in future releases.
-5. **Settings**: This button provides access to the settings menu, where you can
+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.
+   (:guilabel:`Users`), the apps settings (:guilabel:`Apps`) and administrative settings (:guilabel:`Admin`) including access to ownCloud's log. You will also find logout button in this menu.
+5. **Apps**: This button is only visible to administrators. Using this  	   button allows administrators to enable/disable apps.