New Android app page in user manual

Conflicts:
	user_manual/contents.rst

user_manual/android/android_app.rst

@@ -16,11 +16,10 @@ some advantages over the Web interface:
 Getting the ownCloud Android App
 --------------------------------
 
-One way to get your ownCloud Android app is to log into your ownCloud 
-server using a Web browser such as Chrome, Firefox, or 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
+One way to get your ownCloud Android app is to log into your ownCloud server 
+from your Android device using a Web browser such as Chrome, Firefox, or 
+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
@@ -37,7 +36,8 @@ Connecting to Your ownCloud Server
 
 The first time you run your ownCloud Android app it opens to a configuration 
 screen. Enter your server URL, login name, password, and click the Connect 
-button.
+button. (Click the eyeball to the right of your password to expose your 
+password.)
 
 .. figure:: /images/android-new-account.png
 
@@ -50,6 +50,66 @@ setup.
 
 .. figure:: /images/android-ssl-cert.png
 
+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.
+
+.. figure:: /images/android-files-page.png
+
+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.
+
+.. figure:: /images/android-upload.png
+
+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
 
 
-If you have more than one ownCloud account, 
+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
+
+
+Settings
+--------
+
+The Settings screen offers a number of useful options. In the Accounts 
+section you can configure multiple ownCloud accounts.
+
+The Security section sets up strong two-factor authentication by allowing you 
+to add a PIN (personal identification number) to access your account.  
+
+The Instant Uploads section creates a directory, :file:`/InstantUpload`, and 
+any photos or videos created with your Android device's camera are instantly 
+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 save precious cell minutes.
+
+.. 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

user_manual/contents.rst

@@ -21,10 +21,4 @@ ownCloud User Manual
     migration
     userpreferences
     external_storage/google_drive
-
-
-
-.. Indices and tables
-.. ==================
-
-.. * :ref:`genindex`
+    android/android_app