Merge pull request #800 from owncloud/syncclient

Add note re improvements in desktop sync client to what's new

user_manual/contents.rst

@@ -18,6 +18,5 @@ ownCloud User Manual
     pim/index
     documents
     bookmarks
-    migration
     userpreferences
     external_storage/google_drive

user_manual/files/files.rst

@@ -170,19 +170,13 @@ edit ``/etc/davfs2/davfs2.conf`` and add::
 
 **Problem:** Certificate warnings
 
-<<<<<<< HEAD
-**Solution:** If you use a self-signed certificate, you will get a warning. To change this, you need to adress the "pem"-file of your certificate. 
-At first copy ``mycertificate.pem`` to  - for example - ``/etc/davfs2/certs/``. After that edit :file:`/etc/davfs2/davfs2.conf` and uncomment the line ``servercert`` (or add it). 
-Now add the path of your certificate. In this this example::
-=======
 **Solution:** If you use a self-signed certificate, you will get a warning. To 
 change this, you need to configure ``davfs2`` to recognize your certificate. 
 Copy ``mycertificate.pem`` to ``/etc/davfs2/certs/``. Then edit 
 ``/etc/davfs2/davfs2.conf`` and uncomment the line ``servercert``. Now add the 
 path of your certificate as in this example::
 
->>>>>>> 28e0495... Overhaul of WebDAV page; many corrections and updates
-    servercert   /etc/davfs2/certs/mycertificate.pem
+ servercert   /etc/davfs2/certs/mycertificate.pem
 
 Accessing Files Using Mac OS X
 ------------------------------

user_manual/installing_apps.rst

@@ -1,19 +0,0 @@
-# Installing Apps in ownCloud
-
-ownCloud functionality can be enhanced by installing apps that run in the server instance and provide additional features such as a music player and server, single file encryption, an RSS aggregator and many more. An app repository can be found at apps.owncloud.com, where apps are listed, ranked, discussed and offered for download. A small subsection of these apps can be downloaded and installed directly from the Apps menu inside ownCloud. The majority of these apps however needs to be installed manually by downloading the zipped app from the app repository, uploading and unpacking it inside the ownCloud server instance. Provided app and ownCloud version are compatible, a refresh of the app section will then show this app in the list of installable apps in a column at the left of the ownCloud web interface.
-
-# Security notice
-
-Only apps listed as installable form within ownCloud have undergone extensive security checks. All other apps are installed at the users' own risk. Manually added apps are parsed by a code checker, apps found to request questionable permissions are blocked from being installed. At the moment, there is no user facing message about this - the app just does not appear in the list of available apps.
-
-# Troubleshooting
-
-If a manual app install fails, this could be due to the fact that
-
-+you have downloaded a version incompatible with the ownCloud version in use
-
-+the app has been rejected by the internal app code checker
-
-+there is a genuine bug in the app that prevents it from running. 
-
-Please refer to the comment section in apps.owncloud.com to check if others have raised similar problems. Note that the score and download numbers of an app are a helpful, but not a sufficient measure of the quality and security of an app.

user_manual/whats_new.rst

@@ -1,6 +1,14 @@
+==================================
 What's New for Users in ownCloud 8
 ==================================
 
+Desktop Sync Client Shares From File Manager, Selective Sync
+------------------------------------------------------------
+
+The Desktop Sync Client now allows you to share files directly from your file 
+manager, and has a new graphical selective sync file chooser. See the 
+`ownCloud Desktop Client Manual <http://doc.owncloud.org/desktop/1.8/>`_ for 
+more information.
 
 Favorites
 ---------