More updates to the android docs.

manual/source/android.rst

@@ -13,7 +13,7 @@ smartphones or tablet may vary slightly in appearance.
 
 Open the :guilabel:`Google Play Store` app and search for OpenLP, and you will
 find :guilabel:`OpenLP - Remote 2`. As an alternative use `this link
-<https://play.google.com/store/apps/details?id=org.openlp.android2>` to go to
+<https://play.google.com/store/apps/details?id=org.openlp.android2>`_ to go to
 the apps page in Google Play Store. Now install the app.
 
 .. image:: pics/droid_start.png
@@ -102,98 +102,93 @@ Selecting :guilabel:`Service List` will take you to the Service Manager.
 Selecting an item with a short press in the service will immediately take it 
 live on the projection screen and you will stay on the service screen on your 
 device. Selecting an item with a long press in the service will immediately take 
-it live on the projection screen and to the live display on your device. You can 
+it live on the projection screen and to the live display on your device.
-also move up and down through the service items using the :guilabel:`Previous` 
-and :guilabel:`Next` buttons as shown below. Use your hardware back button to 
-take you back to the main screen.
 
-.. image:: pics/droid_service_list.png
+.. image:: pics/droid_service.png
 
-Slide
+Live List
-^^^^^
+^^^^^^^^^
 
-If you selected a service item with multiple verses or images you can change 
+Selecting :guilabel:`Live List` will display what ever is in Service Manager
-verses or images by either selecting them with your finger or using the 
+at the time, or what is live at the moment. If there is items in the Service
-:guilabel:`Previous` and :guilabel:`Next` buttons. Use your hardware back button 
+Manager they will be shown on the left, and the live item will be shown on the
-to take you back to the main screen.
+right.
 
-.. image:: pics/droid_slide.png
+.. image:: pics/droid_live_list_portrait.png
 
-Live
+When using the :guilabel:`Live List` it can be an advantage to use the device in
-^^^^
+landscape mode.
 
-Selecting the :guilabel:`Live` button will display what ever is live at the time 
+.. image:: pics/droid_live_list_landscape.png
-from to your Android device. Use your hardware back button 
-to take you back to the main screen.
 
-Display
-^^^^^^^
 
-Selecting the :guilabel:`Display` button will give you the ability to blank and 
+Stage View
-unblank your projection screen from your chosen method :ref:`above <droid_blank>`.
+^^^^^^^^^^
 
-.. image:: pics/droid_blank_button.png
+Selecting :guilabel:`Stage View` will display the stage view on your Android 
+evice. See the :ref:`stage_view` section in the manual for a detailed
+description.
 
-The title :guilabel:`Blank display to` means your display is live. Touching the 
+.. image:: pics/droid_stage_view.png
-:guilabel:`Blank display to` will blank the projection screen to the chosen 
-method defined in Settings and the button will change to 
-:guilabel:`Reset display from`. Touching it again will cycle back to 
-:guilabel:`Blank display to` unblanking the screen for the live display.
 
-Stage
+Live View
-^^^^^
+^^^^^^^^^^
 
-Selecting the :guilabel:`Stage` button will display the stage view on your 
+Selecting :guilabel:`Live View` will display the live view on your Android
-Android device. See the :ref:`stage_view` section in the manual for a detailed 
+device. See the :ref:`main_view` section in the manual for a detailed 
-description. Use your hardware back button to take you back to the main screen.
+description.
 
-.. image:: pics/droid_stage.png
+.. image:: pics/droid_live_view.png
 
 Alert
 ^^^^^
 
-You can send an alert to the projection screen by entering the text in the box 
+To send an alert to the display, touch the alert button at the top right of the
-and clicking on :guilabel:`Send`. The alert will be displayed as you have 
+screen.
-it configured in :ref:`configure_alerts`. Use your hardware back button to take 
+
-you back to the main screen.
+|droid_alert_button| **Alert button**
+
+You can send an alert to the display by entering the text in the box and
+clicking on :guilabel:`Process`. The alert will be displayed as you have it 
+configured in :ref:`configure_alerts`.
 
 .. image:: pics/droid_alert.png
 
-Search
-------
 
-Using the search function gives you the ability to search for a particular media, 
+.. _droid_blank:
-add it to the service or display it immediately.
 
-To use search, press the hardware magnifying glass button on your phone or you 
+Blank Display
-can press the hardware menu button and then select :guilabel:`Search` and you 
+^^^^^^^^^^^^^
-will be taken to the search screen.
 
-.. image:: pics/droid_search_all1.png
+To blank the display, touch the blank button at the top right of the screen.
 
-Enter the text you want to search for in the text box at the top. For this 
+|droid_blank_button| **Blank button**
-example we are using the search word "Jesus". You can click the magnifying glass 
-next to the text box or press the return on your phone keyboard. You will be 
-presented with a list of media in which your search word was found. 
 
-**Note:** When searching the Bible you must enter the exact name, chapter, 
+Using the display blank type gives you the ability to blank your screen to the 
-verse or verses. Searching songs will search titles and lyrics with the text 
+methods described below. You can find out more about this feature and how it 
-used.
+operates on the main computer at :ref:`blank_control`.
 
-This screen shows the number of instances your searched text is found. 
+**Show Live:**
+    Do not blank, or unblank the display.
 
-.. image:: pics/droid_found1.png
+**Display Blank:**
+    Choosing this option will blank your projector to black as if it were shut 
+    off.
 
-As you can see in the example, there are 130 songs with the word "Jesus" in them. 
+**Display Theme:**
-You can scroll through the list of songs until you find the one you want.
+    Choosing this option will show your blank theme only, without lyrics or 
+    verses. If you are blanking a song with an assigned theme it will blank to 
+    that theme. If no theme is assigned or you are blanking a presentation or 
+    image, it will blank to the global theme.
 
-.. image:: pics/droid_found_select1.png
+**Display Desktop:**
+    Choosing this option will show your desktop wallpaper or a program that you 
+    have open on the extended monitor or projector. You can seamlessly switch 
+    between the desktop wallpaper or a program and OpenLP by Blank to Desktop.
 
-Click on :guilabel:`Add to Service` to add your media to the bottom of the 
+.. image:: pics/droid_blank.png
-:ref:`creating_service`. Click on :guilabel:`Send Live` to immediately display 
-your media on the projection screen.
 
-.. image:: pics/droid_found_add1.png
 
-When you have completed your search you must press the back button on your phone 
+.. |droid_alert_button| image:: pics/droid_alert_button.png
-to return to the main screen.
+
+.. |droid_blank_button| image:: pics/droid_blank_button.png

manual/source/configure.rst

@@ -676,7 +676,7 @@ Generate SSL certificate :ref:`ssl_config`.
 
 *Changing from a Secure to Non Secure setup requires a restart of OpenLP.*
 
-.. _user_auth
+.. _user_auth:
 
 User Authentication 
 ^^^^^^^^^^^^^^^^^^^