Updated with new images and text for 1.8

22 files changed, 50 insertions, 39 deletions

diff --git a/user_manual/android_app.rst b/user_manual/android_app.rst
index de2b2d57b6..c648af7729 100644
--- a/user_manual/android_app.rst
+++ b/user_manual/android_app.rst
@@ -22,13 +22,13 @@ Dolphin. The first time you log in to a new ownCloud account you'll see a screen
 with a download link to the ownCloud app in the `Google Play store
 <https://play.google.com/store/apps/details?id=com.owncloud.android>`_.
 
-.. figure:: images/android-first-screen.jpg
+.. figure:: images/android-1.png
+   :scale: 75% 
+   :alt: Android app new account welcome screen.
 
-You will also find these links on your Personal page in the Web interface,
+You will also find these links on your Personal page in the ownCloud Web interface.
 
-You can also get it from the `Amazon App store 
-<http://www.amazon.com/ownCloud-Inc/dp/B00944PQMK/>`_, and get source code and 
-more information from the `ownCloud download page 
+Find source code and more information from the `ownCloud download page 
 <http://owncloud.org/install/#mobile>`_.
 
 Connecting to Your ownCloud Server
@@ -39,64 +39,79 @@ screen. Enter your server URL, login name, password, and click the Connect
 button. (Click the eyeball to the right of your password to expose your 
 password.)
 
-.. figure:: images/android-new-account.png
+.. figure:: images/android-2.png
+   :scale: 75% 
+   :alt: New account creation screen.
 
 For best security your ownCloud server should be SSL-enabled, so that you can 
 connect via ``https``. The ownCloud app will test your connection as soon as 
 you enter it and tell you if you entered it correctly. If your server has a 
-self-signed SSL certificate you'll get a scary warning how it is not to be 
+self-signed SSL certificate you'll get a warning that it is not to be 
 trusted. Click the OK button to accept the certificate and complete your account 
 setup.
 
-.. figure:: images/android-ssl-cert.png
+.. figure:: images/android-3.png 
+   :alt: SSL certificate warning.
 
 Managing Files
 --------------
 
-Now you should see the Files page of your ownCloud account. Click the overflow 
-button at the top right (that's the one with three vertical dots, and that is 
-really what it is called) to open a user menu. ``Refresh account`` refreshes the 
-page view. ``Settings`` take you to your settings menu. ``Sort`` gives you the 
-option to sort your files by date, or alphabetically.
+Now you should see the Files page of your ownCloud account. 
 
-.. figure:: images/android-files-page.png
+.. figure:: images/android-4.png
+   :scale: 75% 
+   :alt: Your ownCloud Files page.
+
+The ownCloud menu at the top left shows the name of the logged-in user, has a 
+shortcut to your files, and contains the Settings button.
+
+.. figure:: images/android-5.png
+   :alt: Top-left menu.
+
+Click the overflow button at the top right (that's the one with three vertical 
+dots, and that is really what it is called) to open a user menu. ``Refresh 
+account`` syncs your files, and ``Sort`` gives you the option to sort your files 
+by date, or alphabetically.
+
+.. figure:: images/android-6.png
+   :alt: Top-right menu.
 
 The little file folder icon to the left of the overflow button opens a dialog to 
 create a new folder. The arrow button opens a file upload dialog, and you can 
 either upload content from other Android apps such as Google Drive, the Gallery, 
-your music player, or from your Android filesystem. When you add a new file 
-you will see a confirmation on the top left when it has uploaded successfully, 
-and it is immediately synchronized with the server.
+your music player, or from your Android filesystem.
 
-.. figure:: images/android-upload.png
+.. figure:: images/android-7.png
+   :scale: 75%
+   :alt: File upload dialogue.
 
 All files (that you have permission to access) on your ownCloud server are 
 displayed in your Android app, but are not downloaded until you download them. 
 Downloaded files are marked with a green arrow.
 
-.. figure:: images/android-file-list.png
-
-Download and preview a file with a short press on the filename.  When the file 
-is in preview mode, a short press on the overflow button opens a menu with 
-options for sharing, opening with an app, removing, sending, and displaying file 
-details. 
-
-.. figure:: images/android-file.png
-
+.. figure:: images/android-8.png
+   :scale: 75%
+   :alt: Downloaded files are marked with green arrows.
 
-A long press on the filename does not download it, but opens a dialog with 
-options for sharing, downloading, renaming, moving, removing, sending, and 
-viewing file details. 
-
-
-.. figure:: images/android-file-options.png
+Download and preview a file with a short press on the filename.  Then a short 
+press on the overflow button opens a menu with 
+options for managing your file.
 
+.. figure:: images/android-9.png
+   :scale: 75%
+   :alt: File management options. Betsy Ross says "Don't believe everything you 
+   read on the Internet."
 
 Settings
 --------
 
-The Settings screen offers a number of useful options. In the Accounts 
-section you can configure multiple ownCloud accounts.
+Use the Settings screen to control your ownCloud app functions.
+
+.. figure:: images/android-10.png
+   :scale: 75%
+   :alt: Setting screen.
+
+In the Accounts section you can set up and manage multiple accounts.
 
 The Security section sets up strong two-factor authentication by allowing you 
 to add a PIN (personal identification number) to access your account.  
@@ -107,9 +122,5 @@ uploaded to this directory. You also have the option to choose any other
 existing directory. Another nice option is Upload Pictures/Video via WiFi Only, 
 to conserve your Internet data usage.
 
-.. figure:: images/android-settings.png
-
 The bottom section of the Settings screen has links to help and the 
 app's version number.
-
-.. figure:: images/android-help.png
diff --git a/user_manual/images/android-1.png b/user_manual/images/android-1.png
new file mode 100644
index 0000000000..ed45645a70
--- /dev/null
+++ b/user_manual/images/android-1.png
diff --git a/user_manual/images/android-10.png b/user_manual/images/android-10.png
new file mode 100644
index 0000000000..187a753eb8
--- /dev/null
+++ b/user_manual/images/android-10.png
diff --git a/user_manual/images/android-2.png b/user_manual/images/android-2.png
new file mode 100644
index 0000000000..ddee8e4068
--- /dev/null
+++ b/user_manual/images/android-2.png
diff --git a/user_manual/images/android-3.png b/user_manual/images/android-3.png
new file mode 100644
index 0000000000..14afed9f0f
--- /dev/null
+++ b/user_manual/images/android-3.png
diff --git a/user_manual/images/android-4.png b/user_manual/images/android-4.png
new file mode 100644
index 0000000000..ee9cf66d23
--- /dev/null
+++ b/user_manual/images/android-4.png
diff --git a/user_manual/images/android-5.png b/user_manual/images/android-5.png
new file mode 100644
index 0000000000..d089cc1a36
--- /dev/null
+++ b/user_manual/images/android-5.png
diff --git a/user_manual/images/android-6.png b/user_manual/images/android-6.png
new file mode 100644
index 0000000000..20f6fbbd06
--- /dev/null
+++ b/user_manual/images/android-6.png
diff --git a/user_manual/images/android-7.png b/user_manual/images/android-7.png
new file mode 100644
index 0000000000..aaa33bf15c
--- /dev/null
+++ b/user_manual/images/android-7.png
diff --git a/user_manual/images/android-8.png b/user_manual/images/android-8.png
new file mode 100644
index 0000000000..b1ecc62f82
--- /dev/null
+++ b/user_manual/images/android-8.png
diff --git a/user_manual/images/android-9.png b/user_manual/images/android-9.png
new file mode 100644
index 0000000000..631f6b19a9
--- /dev/null
+++ b/user_manual/images/android-9.png
diff --git a/user_manual/images/android-downloads.png b/user_manual/images/android-downloads.png
deleted file mode 100644
index e0bb545487..0000000000
--- a/user_manual/images/android-downloads.png
+++ /dev/null
diff --git a/user_manual/images/android-file-list.png b/user_manual/images/android-file-list.png
deleted file mode 100644
index e479b9f0df..0000000000
--- a/user_manual/images/android-file-list.png
+++ /dev/null
diff --git a/user_manual/images/android-file-options.png b/user_manual/images/android-file-options.png
deleted file mode 100644
index 12867a316c..0000000000
--- a/user_manual/images/android-file-options.png
+++ /dev/null
diff --git a/user_manual/images/android-file.png b/user_manual/images/android-file.png
deleted file mode 100644
index 89ffd28bfc..0000000000
--- a/user_manual/images/android-file.png
+++ /dev/null
diff --git a/user_manual/images/android-files-page.png b/user_manual/images/android-files-page.png
deleted file mode 100644
index 1c7fc4ddad..0000000000
--- a/user_manual/images/android-files-page.png
+++ /dev/null
diff --git a/user_manual/images/android-first-screen.jpg b/user_manual/images/android-first-screen.jpg
deleted file mode 100644
index f4c5132ad9..0000000000
--- a/user_manual/images/android-first-screen.jpg
+++ /dev/null
diff --git a/user_manual/images/android-help.png b/user_manual/images/android-help.png
deleted file mode 100644
index 56a7464f5f..0000000000
--- a/user_manual/images/android-help.png
+++ /dev/null
diff --git a/user_manual/images/android-new-account.png b/user_manual/images/android-new-account.png
deleted file mode 100644
index ffbe12e594..0000000000
--- a/user_manual/images/android-new-account.png
+++ /dev/null
diff --git a/user_manual/images/android-settings.png b/user_manual/images/android-settings.png
deleted file mode 100644
index 7a160845bb..0000000000
--- a/user_manual/images/android-settings.png
+++ /dev/null
diff --git a/user_manual/images/android-ssl-cert.png b/user_manual/images/android-ssl-cert.png
deleted file mode 100644
index 9286fe6278..0000000000
--- a/user_manual/images/android-ssl-cert.png
+++ /dev/null
diff --git a/user_manual/images/android-upload.png b/user_manual/images/android-upload.png
deleted file mode 100644
index 6ee1b95201..0000000000
--- a/user_manual/images/android-upload.png
+++ /dev/null