Merge pull request #3838 from owncloud/docfixes

move new features to introduction, fix missing images

doc/installing.rst

@@ -21,56 +21,18 @@ will display a notification when an update is available.
 Linux users must also have a password manager enabled, such as GNOME Keyring or
 KWallet, so that the sync client can login automatically.
 
-Improvements and New Features
------------------------------
-
-The 2.0 release of the ownCloud desktop sync client has many new features and 
-improvements.
-
-  * Multi-account support
-  * Many UI improvements
-  * Accessibility improvements (high contrast schemes)
-  * Automatic Bandwidth Throttling
-  * Don't show redundant directory entries in activity log
-  * Remove deleted accounts properly from toolbar
-  * File manager integration: Show hidden files as ignored
-  * Show wizard when last account was deleted
-  * Do not sync down new big folders from server without user's consent
-  * Integrate Selective Sync into the default UI
-  * More reliable reconnect after timeout
-  * Use SI units for the file sizes
-  * Improve progress reporting during sync
-  * Sharing: Do not allow sharing the root folder
-  * Sharing: Show thumbnail
-  * Client Updater: Check for updates periodically, not only once per run
-  * Quota: Only refresh from server when UI is shown
-  * SSL Button: Show more information
-  * System proxy: Ask user for credentials if needed
-  * Several fixes and performance improvements in the sync engine
-  * OS X: Show file name in UI if file has invalid UTF-8 in file name 
-  * OS X: Support native finder integration for 10.10 Yosemite  
-  * Network: Try to use SSL session tickets/identifiers
-  * Windows: Support paths >255 characters
-  * Windows, OS X: Allow to not sync hidden files
-  * Windows: Remove misleading option to remove sync data
-  * Windows: Do not provoke Active Directory account locking if password changes
-  * Windows: Fix installer when installing unprivileged
-
-.. note:: When you upgrade from 1.8, restart Windows to ensure that all new 
-   features are visible.
-
 Installation Wizard
 -------------------
 
 The installation wizard takes you step-by-step through configuration options and 
 account setup. First you need to enter the URL of your ownCloud server.
 
-.. image:: images/client1.png
+.. image:: images/client-1.png
    :alt: form for entering ownCloud server URL
    
 Enter your ownCloud login on the next screen.
 
-.. image:: images/client2.png
+.. image:: images/client-2.png
    :alt: form for entering your ownCloud login
 
 On the Local Folder Option screen you may sync 
@@ -78,9 +40,9 @@ all of your files on the ownCloud server, or select individual folders. The
 default local sync folder is ``ownCloud``, in your home directory. You may 
 change this as well.
 
-.. image:: images/client3.png
+.. image:: images/client-3.png
    :alt: Select which remote folders to sync, and which local folder to store 
-   them in.
+    them in.
    
 When you have completed selecting your sync folders, click the Connect button 
 at the bottom right. The client will attempt to connect to your ownCloud 
@@ -88,28 +50,8 @@ server, and when it is successful you'll see two buttons: one to connect to
 your ownCloud Web GUI, and one to open your local folder. It will also start 
 synchronizing your files.
 
-.. image:: images/client4.png
+.. image:: images/client-4.png
    :alt: A successful server connection, showing a button to connect to your 
-   Web GUI, and one to open your local ownCloud folder
+    Web GUI, and one to open your local ownCloud folder
 
-Click the Finish button, and you're all done.   
+Click the Finish button, and you're all done. 
-
-When you are in your local ownCloud folder, you can right-click any file or 
-folder, and then left-click "Share with ownCloud" to create a share link. Note 
-that Windows may also have a Share With option. This is not the ownCloud Share 
-option. Linux users must install the ``owncloud-client-nautilus`` package to 
-enable file sharing from the Nautilus file manager. The ownCloud share dialog 
-looks like the following example on Ubuntu Linux:
-
-.. image:: images/client5.png
-   :alt: the ownCloud file share option is integrated into the normal 
-   right-click file menu in your file manager
-
-You may change your sync options at any time by opening your ownCloud client 
-and selecting which folders to sync, or to remove from synchronization.
-you saw in the installation wizard. **If you un-check any folders that 
-you have already synchronized, they will be deleted from your local system.**
-
-.. image:: images/client6.png
-   :alt: Client dialogue to select different files to sync, or to remove from 
-   syncing

doc/introduction.rst

@@ -14,4 +14,41 @@ and local PC.
 
 .. note:: Because of various technical issues, desktop sync clients older than 
    1.7 will not allowed to connect and sync with the ownCloud 8.1 server. It is 
-   highly recommended to keep your client updated.
+   highly recommended to keep your client updated.
+   
+Improvements and New Features
+-----------------------------
+
+The 2.0 release of the ownCloud desktop sync client has many new features and 
+improvements.
+
+  * Multi-account support
+  * Many UI improvements
+  * Accessibility improvements (high contrast schemes)
+  * Automatic bandwidth throttling
+  * No redundant directory entries in activity log
+  * Remove deleted accounts properly from toolbar
+  * File manager integration: show hidden files as ignored
+  * Do not sync new big folders from server without user's consent
+  * Integrate selective sync into the default UI
+  * More reliable reconnect after timeout
+  * Improve progress reporting during sync
+  * Sharing: Do not allow sharing the root folder
+  * Sharing: Show thumbnail
+  * Client Updater: Check for updates periodically, not only once per run
+  * Quota: Only refresh from server when UI is shown
+  * SSL Button: Show more information
+  * System proxy: Ask user for credentials if needed
+  * Several fixes and performance improvements in the sync engine
+  * OS X: Show file name in UI if file has invalid UTF-8 in file name 
+  * OS X: Support native finder integration for 10.10 Yosemite  
+  * Network: Try to use SSL session tickets/identifiers
+  * Windows: Support paths >255 characters
+  * Windows, OS X: Allow to not sync hidden files
+  * Windows: Remove misleading option to remove sync data
+  * Windows: Do not provoke Active Directory account locking if password changes
+  * Windows: Fix installer when installing unprivileged
+
+.. note:: When you upgrade from 1.8, restart Windows to ensure that all new 
+   features are visible.
+