Various cleanups, linkages, and whatnot.

manual/source/bibles.rst

@@ -2,15 +2,15 @@
 Bibles
 ======
 
-Managing Bibles in OpenLP is a relatively simple process. There are also 
+Managing Bibles in OpenLP is a relatively simple process. There are also
 converters provided to get data from other formats into OpenLP.
 
-.. _bible-importer:
+.. _bibles-import:
 
-Bible Importer
+Bible Import Wizard
-==============
+===================
 
-If you are using an earlier version of OpenLP or, come from another software 
+If you are using an earlier version of OpenLP or, come from another software
 package, you may be able to convert your existing database to work in OpenLP
 2.0. To access the Bible Importer :menuselection:`File --> Import --> Bible`.
 You may also enter the Bible Importer by clicking the :guilabel:`Import Icon:`
@@ -44,13 +44,13 @@ It may take some time to import your Bible so please be patient.
 
 .. image:: pics/bibleimportfinished1.png
 
-When the import has finished click :guilabel:`Finish` and you should be 
+When the import has finished click :guilabel:`Finish` and you should be
 ready to use your Bible in OpenLP.
 
 Importing from openlp.org 1.x
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Importing Bibles from openlp.org 1.x is a simple process. First you will need to 
+Importing Bibles from openlp.org 1.x is a simple process. First you will need to
 locate your version 1.x Bibles. Version 1.x Bibles have the `.bible` file
 extension.
 
@@ -74,16 +74,16 @@ your OSIS Bible file and continue the import process.
 **About OSIS Formatted Bibles**
 
 The OSIS XML standard was designed to provide a common format for distribution
-of electronic Bibles. More information can be found out at the `Bible Technologies website 
+of electronic Bibles. More information can be found out at the `Bible Technologies website
-<http://www.bibletechnologies.net/>`_. 
+<http://www.bibletechnologies.net/>`_.
 
-If you have any software installed that is part of the `Sword Project 
+If you have any software installed that is part of the `Sword Project
 <http://www.crosswire.org/sword/index.jsp>`_ it can be easily converted.
 
-You can use the commands below convert Bibles from that software to OSIS format. 
+You can use the commands below convert Bibles from that software to OSIS format.
 
-The following commands are used in all platforms and the commands are case 
+The following commands are used in all platforms and the commands are case
-sensitive across all platforms. To convert a Bible using the command prompt in 
+sensitive across all platforms. To convert a Bible using the command prompt in
 Windows or a terminal in Linux or Mac OS X you would type::
 
     mod2osis biblename > biblename.osis
@@ -93,7 +93,7 @@ something similar to this::
 
     mod2osis KJV > kjv.osis
 
-You may also wish to dictate a file location for the conversion to place the 
+You may also wish to dictate a file location for the conversion to place the
 osis file for example::
 
     mod2osis KJV > /home/user/bibles/kjv.osis
@@ -101,12 +101,12 @@ osis file for example::
 Importing OpenSong Bibles
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Converting from OpenSong you will need to locate your Bibles database. In the 
+Converting from OpenSong you will need to locate your Bibles database. In the
-later versions of OpenSong you are asked to define the location of this. The 
+later versions of OpenSong you are asked to define the location of this. The
 songs will be located in a folder named :guilabel:`Bibles`. This folder should
 contain files with all your Bibles in them without a file extension. (file.xmms).
-When you have located this folder you will need to select the Bible from the 
+When you have located this folder you will need to select the Bible from the
-folder. 
+folder.
 
 You may also import downloaded Bibles from OpenSong. The process is the same,
 except you will need to extract the Bible from a zip file. This is usually done
@@ -130,7 +130,7 @@ as another option and does require an internet connection.
 To use the web download feature select web download from the import wizard.
 
 You can select from several options of location to download from and also
-what Bible translation you need. You will probably want to choose the location 
+what Bible translation you need. You will probably want to choose the location
 from where you get the best performance or has the translation you need.
 
 .. image:: pics/webbible1.png
@@ -152,7 +152,7 @@ If you have a Bible in .csv format OpenLP can import it. CSV Bibles will
 consist of two files a `books` file and a `verse` file. Select CSV from the list
 of Bible types to import.
 
-You are now ready to select your .csv files. You will need to select both your 
+You are now ready to select your .csv files. You will need to select both your
 books and verse file location.
 
 .. image:: pics/csvimport1.png

manual/source/creating_service.rst

@@ -4,27 +4,27 @@ Creating a service
 
 Now that you have OpenLP set up the way you want, it is time to put it to use.
 
-Everything you need to display will be in the left panel called *Media Manager*
+Everything you need to display will be in the left panel called the
-under their respective categories. Using the Media Manager you will load new 
+:ref`g-media-manager`, under their respective categories. Using the
-Media, Songs, Images, Bibles, or create a Custom slide as discussed earlier in
+:ref`g-media-manager` you can add new media, songs, image, Bibles or create a
-:ref:`mediamanager`. 
+custom slide as discussed earlier in the :ref:`media-manager` section.
 
 .. image:: pics/mediamanager_songs.png
 
-On the right side of your screen at the top is the Service Manager. 
+On the right side of your screen at the top is the Service Manager.
 
 .. image:: pics/service_manager.png
 
-Anything you want to display should be in the Service Manager and preferably in 
+Anything you want to display should be in the Service Manager and preferably in
-the order you want to display it. To add your media you can click on an item in 
+the order you want to display it. To add your media you can click on an item in
-the *Media Manager* hold and drag your selection from the Media Manager over to 
+the *Media Manager* hold and drag your selection from the Media Manager over to
-the *Service Manager* or, after clicking the media or verse you want to use, 
+the *Service Manager* or, after clicking the media or verse you want to use,
-click the + sign icon above. This will add your media to the service side at the 
+click the + sign icon above. This will add your media to the service side at the
-bottom. Once it is in the Service Manager you can click on your item and drag 
+bottom. Once it is in the Service Manager you can click on your item and drag
-and drop it in the order you want or, click the item and use the arrow icons 
+and drop it in the order you want or, click the item and use the arrow icons
-below to move it up or down in the order you want. Note: You always have the 
+below to move it up or down in the order you want. Note: You always have the
-option to send any media live direct from the Media Manager. Please see 
+option to send any media live direct from the Media Manager. Please see the
-:ref:`mediamanager` for more details.
+:ref:`media-manager` section for more details.
 
 .. image:: pics/service_arrows.png
 
@@ -33,104 +33,104 @@ Displaying an Item
 
 When you have all of your items needed for the service in your Service Manager
 there are a few ways to get them to display on the screen. You can double-click
-the item, click it once with the mouse and push the :kbd:`Enter` key on your 
+the item, click it once with the mouse and push the :kbd:`Enter` key on your
-keyboard, right click the item and left click *Show Live* or click it once with 
+keyboard, right click the item and left click *Show Live* or click it once with
-the mouse and click on the projector at the bottom of the Service Manager. 
+the mouse and click on the projector at the bottom of the Service Manager.
 
 .. image:: pics/service_send_live.png
 
-Any of these methods will display your item on 
+Any of these methods will display your item on
-the screen. When your item is displayed, it will appear in the Live windows just 
+the screen. When your item is displayed, it will appear in the Live windows just
-to the left of the Service Manager. 
+to the left of the Service Manager.
 
 .. image:: pics/service_live.png
 
-To Preview an item in the left *Preview* panes, right click the item and left 
+To Preview an item in the left *Preview* panes, right click the item and left
 click *Show Preview*.
 
 Changing a Service theme
 ------------------------
 
-When you get your Service file set up and you are previewing a slide or sending 
+When you get your Service file set up and you are previewing a slide or sending
-it Live and you notice you don't have the correct theme for it, you can right 
+it Live and you notice you don't have the correct theme for it, you can right
 click the item and mouseover :guilabel:`Change Item Theme` and select the theme
 you want to use.
 
 Moving through a Service
 ------------------------
 
-Once you have your first item displayed live you can move through the service in 
+Once you have your first item displayed live you can move through the service in
-a couple of ways. You can double-click on each item you need displayed, or click 
+a couple of ways. You can double-click on each item you need displayed, or click
-it once and press enter. If your songs, verses, etc. are in the order you will 
+it once and press enter. If your songs, verses, etc. are in the order you will
-be displaying them, you can use the :kbd:`Right Arrow` key on your keyboard to 
+be displaying them, you can use the :kbd:`Right Arrow` key on your keyboard to
-move down through your service. Pressing the :kbd:`Left Arrow` key will move up 
+move down through your service. Pressing the :kbd:`Left Arrow` key will move up
-through the service. Every time you press the :kbd:`Left Arrow` or 
+through the service. Every time you press the :kbd:`Left Arrow` or
-:kbd:`Right Arrow` key the next item in your Service will be displayed. 
+:kbd:`Right Arrow` key the next item in your Service will be displayed.
 
 Moving through a Song or Bible verses
 -------------------------------------
 
-When you display a song or Bible verse with multiple verses you will need to 
+When you display a song or Bible verse with multiple verses you will need to
-move through them. When a song or verse is being displayed you will see the 
+move through them. When a song or verse is being displayed you will see the
-lyrics in the top Live window and how it actually appears on your display 
+lyrics in the top Live window and how it actually appears on your display
-in the bottom Live window. To change slides you can use your mouse to click on 
+in the bottom Live window. To change slides you can use your mouse to click on
-each slide in the top Live window, use the Left Arrow and Right Arrow icons 
+each slide in the top Live window, use the Left Arrow and Right Arrow icons
 under the top Live window.
 
 .. image:: pics/service_live_arrows.png
 
-You can also use the :kbd:`Down Arrow` key to move down through 
+You can also use the :kbd:`Down Arrow` key to move down through
-the song or verses. Using the :kbd:`Up Arrow` key will move you from bottom to 
+the song or verses. Using the :kbd:`Up Arrow` key will move you from bottom to
-top. :kbd:`Page Up` and :kbd:`Page Down` keys will do the same thing. 
+top. :kbd:`Page Up` and :kbd:`Page Down` keys will do the same thing.
 
 Adding a group of Images
 ------------------------
 
-At some point you may have a group of images to display together. It may be 
+At some point you may have a group of images to display together. It may be
-pictures from a youth group adventure, bulletin announcements, or some other 
+pictures from a youth group adventure, bulletin announcements, or some other
-reason. Once you add your images to the Media Manager hold the :kbd:`Ctrl` key 
+reason. Once you add your images to the Media Manager hold the :kbd:`Ctrl` key
-on your keyboard and click each image you want to add as a group. As you click 
+on your keyboard and click each image you want to add as a group. As you click
-the images they will remain highlighted. When you are done with your selections 
+the images they will remain highlighted. When you are done with your selections
-you can either click the + icon above the images or, click on one of the 
+you can either click the + icon above the images or, click on one of the
-highlighted images, hold the mouse button and drag them over to the Service 
+highlighted images, hold the mouse button and drag them over to the Service
-Manager side and place them where you need them. 
+Manager side and place them where you need them.
 
 .. image:: pics/service_images.png
 
 Sorting a group of Images
 -------------------------
 
-If you do not like the order the images are in, 
+If you do not like the order the images are in,
-right click Images. 
+right click Images.
 
 .. image:: pics/service_reorder.png
 
-Left click Reorder Item. 
+Left click Reorder Item.
 
 .. image:: pics/service_reorder_service_item.png
 
-From this box you will be able to rearrange the order of your images by clicking 
+From this box you will be able to rearrange the order of your images by clicking
-on one and using the :guilabel:`Up` and :guilabel:`Down` arrows to move it to 
+on one and using the :guilabel:`Up` and :guilabel:`Down` arrows to move it to
-where you want it. If there is an image you do not want in your order, click on 
+where you want it. If there is an image you do not want in your order, click on
-it and then click the :guilabel:`Delete` button. When you are done arranging 
+it and then click the :guilabel:`Delete` button. When you are done arranging
-your images click :guilabel:`Save`. 
+your images click :guilabel:`Save`.
 
-If you need to add another image from the Media Manager to your group of images, 
+If you need to add another image from the Media Manager to your group of images,
-left click the image you want to add and hold the mouse button and drag it over 
+left click the image you want to add and hold the mouse button and drag it over
-your group of Images and release the mouse button. You will be given two options, 
+your group of Images and release the mouse button. You will be given two options,
-:guilabel:`Add New Item` and :guilabel:`Add to Selected Item`. 
+:guilabel:`Add New Item` and :guilabel:`Add to Selected Item`.
 
 .. image:: pics/service_add.png
 
-If you click :guilabel:`Add New Item` your image will be separate from your 
+If you click :guilabel:`Add New Item` your image will be separate from your
-group of images as another item at the bottom of the Service. If you click 
+group of images as another item at the bottom of the Service. If you click
-:guilabel:`Add to Selected Item` your image will be added to your group of 
+:guilabel:`Add to Selected Item` your image will be added to your group of
 images.
 
 Adding a service Note
 ---------------------
 
-You have the option to leave yourself or the next tech a service note. This is 
+You have the option to leave yourself or the next tech a service note. This is
 done by right clicking on an item in your service and left clicking *Notes*.
 
 .. image:: pics/service_item_notes.png
@@ -141,49 +141,49 @@ your item.
 
 .. image:: pics/service_note.png
 
-If you need to change your Note or delete it, open it again, delete your text 
+If you need to change your Note or delete it, open it again, delete your text
 and click :guilabel:`Save`
 
 Using the Continuous Loop Timer
 -------------------------------
 
-Once you have a group of images you can easily cycle through them by using the 
+Once you have a group of images you can easily cycle through them by using the
 *Live Controller Bar* timer in between the Live panes.
 
 .. image:: pics/service_timer.png
 
-Adjust the time delay for the seconds in between each image by adjusting the 
+Adjust the time delay for the seconds in between each image by adjusting the
-timer. This timer counter is in seconds. Immediately to the left of the timer is 
+timer. This timer counter is in seconds. Immediately to the left of the timer is
-the button to start the images looping. Click it once to start the continuous 
+the button to start the images looping. Click it once to start the continuous
-loop and once to stop it. You can also use the keyboard shortcut :kbd:`L` to 
+loop and once to stop it. You can also use the keyboard shortcut :kbd:`L` to
-start and stop the continuous loop. The timer will also cycle through Bible 
+start and stop the continuous loop. The timer will also cycle through Bible
-verses and song lyrics. 
+verses and song lyrics.
 
 Using the "Blank to" Control
 ----------------------------
 
-On the *Live Controller Bar* in between the Live windows are three options to 
+On the *Live Controller Bar* in between the Live windows are three options to
-Blank your screen. Clicking on the down arrow next to the blank button will show 
+Blank your screen. Clicking on the down arrow next to the blank button will show
 you your three options.
 
 .. image:: pics/service_blank.png
 
-**Blank Screen** 
+**Blank Screen**
-    Choosing this option will blank your projector to black as if it were shut off. 
+    Choosing this option will blank your projector to black as if it were shut off.
     The shortcut for this option is :kbd:`.` (fullstop/period on your keyboard).
 
-**Blank to Theme** 
+**Blank to Theme**
-    Choosing this option will show your blank theme only, without lyrics or verses. 
+    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 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 
+    If no theme is assigned or you are blanking a presentation or image, it will
-    blank to the global theme. The shortcut for this option is :kbd:`T`. 
+    blank to the global theme. The shortcut for this option is :kbd:`T`.
 
-**Blank to Desktop** 
+**Blank to Desktop**
-    Choosing this option will show your desktop wallpaper or a program that you have 
+    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 one 
+    open on the extended monitor or projector. You can seamlessly switch between one
     program and OpenLP by Blank to Desktop. The shortcut for this option is :kbd:`D`.
-  
+
-You can change or add to the keyboard shortcuts here 
+You can change or add to the keyboard shortcuts here
 :menuselection:`Settings --> Configure Shortcuts`.
 
 New, Open and Saving the service
@@ -196,8 +196,8 @@ The first icon will create a New Service. The second icon will Open an already
 created service file. The third icon will Save the service you created, added to
 or rearranged.
 
-Now that you created your service, tested it and are ready for your worship 
+Now that you created your service, tested it and are ready for your worship
-service, you will want to save your service file. OpenLP will remind you to do 
+service, you will want to save your service file. OpenLP will remind you to do
-this when you close the program or you can click the save button at the top of 
+this when you close the program or you can click the save button at the top of
-your service file. Choose the location you want to save your file and click 
+your service file. Choose the location you want to save your file and click
 :guilabel:`Ok`.

manual/source/glossary.rst

@@ -5,49 +5,58 @@ Glossary
 ========
 
 The developers of OpenLP have strived to make it a straightforward and easy to
-use application. However, it is good to be familiar with a few terms that will 
+use application. However, it is good to be familiar with a few terms that will
 be used throughout this documentation, and when seeking support.
 
-.. _main-window:
+.. _g-main-window:
 
 Main Window
 -----------
 
-The Main Window is what you will see when you first open OpenLP
+The Main Window is what you will see when you first open OpenLP. It contains all
+the tools and plugins that make OpenLP function.
 
 .. image:: pics/mainwindow.png
 
-The Main Window contains all the tools and plugins that make OpenLP function
+.. _g-media-manager:
-
-.. _media-manager:
 
 Media Manager
 -------------
 
-The Media Manager contains a number of tabs the plugins supply to OpenLP.
+The Media Manager contains a number of tabs which the plugins supply to OpenLP.
-Each tab in the Media Manager is called a **Media Item**
+Each tab in the Media Manager is called a :ref:`g-media-item`. You can send
+songs, Bibles, etc from the :ref:`g-media-item` to the
+:ref:`g-preview-slide-controller` or :ref:`g-live-slide-controller`.
 
 .. image:: pics/mediamanager_songs.png
 
-From the Media Manager you can send Media Items to the Preview or Live screens.
+.. _g-media-item:
+
+Media Item
+----------
+
+A media item is a tab in the :ref:`g-media-manager`. The media item contains
+any items from the various plugins which can be displayed on the display screen.
+
+.. g-platform:
 
 Platform
 --------
 
-When the word platform is used, it is usually referring to your operating system,
+When the word "platform" is used, it is usually referring to your operating
-Windows, Linux or MAC OS.
+system, Windows, Linux, (Mac) OS X or FreeBSD/PC-BSD.
 
-.. _preview:
+.. _g-preview-pane:
 
-Preview 
+Preview Pane
--------
+------------
 
-The preview pane is a section to preview your media items before you go live 
+The preview pane is a section to preview your media items before you go live
 with them.
 
 .. image:: pics/preview.png
 
-.. _service-file:
+.. _g-service-file:
 
 Service File
 ------------
@@ -55,25 +64,25 @@ Service File
 A service file is the file that is created when you save your service in OpenLP.
 The service file consist of **Service Items**
 
-.. _service-item:
+.. _g-service-item:
 
 Service Item
 ------------
 
 Service items are the **media items** that are in the **service manager**
 
-.. _service-manager:
+.. _g-service-manager:
 
 Service Manger
 --------------
 
-The service manager contains the media items in your service file. This is the 
+The service manager contains the media items in your service file. This is the
-area where your media items go live. You can also save, open, and edit 
+area where your media items go live. You can also save, open, and edit
 services files from here.
 
 .. image:: pics/servicemanager.png
 
-.. _slide-controller:
+.. _g-slide-controller:
 
 Slide Controller
 ----------------
@@ -83,7 +92,23 @@ being displayed, and moving between the various slides.
 
 .. image:: pics/slidecontroller.png
 
-.. _theme-manager:
+.. _g-preview-slide-controller:
+
+Preview Slide Controller
+------------------------
+
+The preview :ref:`g-slide-controller` shows you a simple preview of your item.
+It does not send any output to the display screen.
+
+.. _g-live-slide-controller:
+
+Live Slide Controller
+---------------------
+
+The live :ref:`g-slide-controller` controls the live output to the display
+screen.
+
+.. _g-theme-manager:
 
 Theme Manager
 -------------

manual/source/mediamanager.rst

@@ -1,19 +1,19 @@
-.. _mediamanager:
+.. _media-manager:
 
 =============
 Media Manager
 =============
 
 Once you get your system set up for OpenLP you will be ready to add content to
-your Service Manager. This will all happen through the :ref:`media-manager`. The
+your Service Manager. This will all happen through the :ref:`g-media-manager`.
-:ref:`media-manager` contains all the Bibles, Songs, Presentations, Media, and 
+The :ref:`g-media-manager` contains all the Bibles, Songs, Presentations, Media,
-Slides that you will project through OpenLP.
+and Custom Slides that you will project through OpenLP.
 
 Enabling the Plugins
 --------------------
 
-You may need to enable the default plugins that are built in to OpenLP. As you 
+You may need to enable the default plugins that are built in to OpenLP. As you
-can see below this is what the *Media Manager* looks like with all the plugins 
+can see below this is what the *Media Manager* looks like with all the plugins
 enabled.
 
 .. image:: pics/mediamanager_songs.png
@@ -30,17 +30,18 @@ You are now ready to add content for your service.
 Adding Media Content
 --------------------
 
-This section will describe how to add the different types of media OpenLP is 
+This section will describe how to add the different types of media OpenLP is
 capable of displaying.
 
 Songs
 ^^^^^
-Clicking on songs in the :ref:`media-manager` will display all of the songs you have 
+Clicking on songs in the :ref:`g-media-manager` will display the songs media
-added by title and author(s).
+item. The songs media item shows a list of all the songs you have added to the
+songs database.
 
 .. image:: pics/mediamanager_songs.png
 
-Using the buttons in the toolbar you can: 
+Using the buttons in the toolbar you can:
 
 |buttons_new| Add a song
     Brings up the dialog box to add a new song.
@@ -58,35 +59,47 @@ Using the buttons in the toolbar you can:
     This option will immediately display your song live.
 
 |buttons_add| Add the selected song to the service
-    This will enter your song in the :ref:`service-manager`. You may also drag your
+    This will enter your song in the :ref:`g-service-manager`. You can also drag
-    song over to the :ref:`service-manager`.
+    your song over to the :ref:`g-service-manager`.
 
 |buttons_db| Maintain the list of authors, topics and books
     Brings up a dialog box to edit authors, topics or song books.
-  over to the Service Manager.
+    over to the Service Manager.
 
-*Note*: Right clicking on a song file will bring up some of the same options.
+*Note:* Right clicking on a song in the list will bring up some of the same
+options.
 
 *Search:*
-  Clicking on the icon in the Search box will display a list of options for you 
+
-  to search your song database.
+Clicking on the icon in the Search box will display a list of options for you to
+search your song database.
 
 .. image:: pics/mediamanager_songs_search.png
 
 You have these options to search.
 
-* *Entire Song:* This option will search Titles, Lyrics and Comments.
+*Entire Song*
-* *Titles:* This option will search Titles only.
+    This option will search Titles, Lyrics and Comments.
-* *Lyrics:* This option will search Lyrics only. 
+
-* *Authors:* This option will search Authors only.
+*Titles*
-* *Themes:* This option will search for the assigned theme to the song.
+    This option will search Titles only.
+
+*Lyrics*
+    This option will search Lyrics only.
+
+*Authors*
+    This option will search Authors only.
+
+*Themes*
+    This option will search for the assigned theme to the song.
 
 Use the :guilabel:`Search` button to display your results in the box below.
 
 Bibles
 ^^^^^^
-Clicking on Bibles in the :ref:`media-manager` will display your options for searching 
+Clicking on Bibles in the :ref:`g-media-manager` will display the Bibles media
-and adding chapters and verses to the :ref:`service-manager`.
+item. The Bibles media item gives you the ability to search for Bible verses and
+add them to the :ref:`g-service-manager`.
 
 .. image:: pics/mediamanager_bibles.png
 
@@ -95,17 +108,18 @@ Using the buttons you can:
 .. image:: pics/mediamanager_bibles_buttons.png
 
 |buttons_import| Import a Bible
-    This is discussed in detail on the :ref:`bible-importer` page in the manual. 
+    This is discussed in detail on the :ref:`bibles-import` page in the manual.
 
 |buttons_preview| Preview the selected Bible
-    Sends your selected verses to the Preview window.
+    Sends your selected verses to the :ref:`g-preview-slide-controller`.
 
 |buttons_live| Send the selected Bible live
-    This option will immediately display your selected verses live.
+    This option will immediately display your selected verses live, sending them
+    to the :ref:`g-live-slide-controller`.
 
 |buttons_add| Add the selected Bible to the service
-    This will enter your verses into the :ref:`service-manager`. You may also
+    This will enter your verses into the :ref:`g-service-manager`. You may also
-    drag and drop your verses over to the :ref:`service-manager`.
+    drag and drop your verses over to the :ref:`g-service-manager`.
 
 **Quick** tab
 
@@ -122,16 +136,17 @@ Using the buttons you can:
     will be displayed on the next slide.
 *Search*
     Use the **Search** button to display your results in the box below.
-  
+
 *Find*
     You will type your search query in this box for the following two searches.
-Clicking the icon in the Find box will give you the choice of searching by 
+
-Scripture Reference or Text Search.
+    Clicking the icon in the Find box will give you the choice of searching by
+    *Scripture Reference* or *Text Search*.
 
     *Scripture Reference*
-        You may search for a specific verse using this format below. 
+        You may search for a specific verse using this format below.
 
-        * Book Chapter 
+        * Book Chapter
         * Book Chapter-Chapter
         * Book Chapter:Verse-Verse
         * Book Chapter:Verse-End (this will display verses to the end of the chapter)
@@ -143,62 +158,64 @@ Scripture Reference or Text Search.
         You may also search by a keyword or words. The more words you use for
         the search, the more you will narrow down your results.
 
-*Results*
+|buttons_clear_results| |buttons_keep_results| *Keep/Clear Results*
-    Clear and Keep.
+    Normally, when you run a search, the old results are cleared. If you wish to
+    retain the previous set of verses, toggle this button.
 
-If you have “Display second Bible verses” selected in 
+If you have "Display second Bible verses" selected in
-:menuselection:`Configure OpenLP --> Bibles` tab, this choice will be visible. 
+:menuselection:`Configure OpenLP --> Bibles` tab, this choice will be visible.
-This option is for displaying another version of the Bible for comparison. Both 
+This option is for displaying another version of the Bible for comparison. Both
-versions will be displayed. If there is not enough space on one slide, the 
+versions will be displayed. If there is not enough space on one slide, the
 Second version will be displayed on the next slide.
 
 Click the :guilabel:`Search` button to display your results in the box below.
 
+*Layout style*
+    There are three options to determine how your Bible verses are displayed.
 
-**Layout style**
+    *Verse Per Slide*
+        This will display one verse per slide.
 
-There are three options to determine how your Bible verses are displayed. 
+    *Verse Per Line*
+        This will start each verse on a new line until the slide is full.
 
-* *Verse Per Slide* will display one verse per slide.
+    *Continuous*
-* *Verse Per Line* will start each verse on a new line until the slide is full.
+        This will run all verses together separated by verse number and chapter
-* *Continuous* will run all verses together separated by verse number and chapter if chapter is selected to show above. This setting is also accessible through :menuselection:`Configure OpenLP --> Bibles` tab.
+        if chapter is selected to show above. This setting is also accessible
+        through :menuselection:`Configure OpenLP --> Bibles` tab.
 
-*Note: Changes to Layout Style do not affect verses already in the Service Manager.*
+    *Note:* Changes to Layout Style do not affect verses already in the
+    :ref`g-service-manager`.
 
 Each search you make will display your verses in the box below.
 
 .. image:: pics/mediamanager_bibles_results.png
 
-Toggle lock to keep or clear the previous results.
+If you would like to display verses that are out of sequence you can click on
-
+the lock icon and continue your search for the next verse or verses. All
-.. image:: pics/mediamanager_bibles_lock.png 
+searches will be shown and kept below. If you click the lock icon again, each
-.. image:: pics/mediamanager_bibles_unlock.png
-
-If you would like to display verses that are out of sequence you can click on 
-the lock icon and continue your search for the next verse or verses. All 
-searches will be shown and kept below. If you click the lock icon again, each 
 new search clears the previous search from the list below.
 
 **Advanced** tab
 
 .. image:: pics/mediamanager_bibles_advanced.png
 
-The Advanced tab is convenient for selecting book, chapter and verse by name and 
+The Advanced tab is convenient for selecting book, chapter and verse by name and
 number.
 
 *Book:*
-  Click on the drop down box and select the book you want to display. 
+  Click on the drop down box and select the book you want to display.
 
 *Chapter: Verse:*
   Select your chapter From and To and Verse From and To.
 
-Version and Second are the same as in Quick tab above. Click on each box and 
+Version and Second are the same as in Quick tab above. Click on each box and
-select the version you wish to display and Second version if you wish to display 
+select the version you wish to display and Second version if you wish to display
 an alternative version for comparison.
 
 **Layout style**
 
-There are three options to determine how your Bible verses are displayed. 
+There are three options to determine how your Bible verses are displayed.
 
 * *Verse Per Slide* will display one verse per slide.
 * *Verse Per Line* will start each verse on a new line until the slide is full.
@@ -219,25 +236,25 @@ Using the buttons you can:
 
 .. image:: pics/mediamanager_presentations_buttons.png
 
-|button_open| Load a new presentation
+|buttons_open| Load a new presentation
     This brings up a dialog box to find your presentation and load it into
     OpenLP.
 
-|button_delete| Delete the selected presentation
+|buttons_delete| Delete the selected presentation
     This removes your presentation from the list.
-    
+
     *Please note*: this will not delete the presentation from your computer,
     only from the OpenLP list.
 
-|button_preview| Preview the selected presentation
+|buttons_preview| Preview the selected presentation
     Sends your selected presentation to the preview window.
 
 *Send the selected Presentation live:*
   This option will immediately display your selected Presentation live.
 
 *Add the selected Presentation to the service:*
-  This will enter your Presentation into the Service Manager. You can also click 
+  This will enter your Presentation into the Service Manager. You can also click
-  and drag your Presentation over to the Service Manager. 
+  and drag your Presentation over to the Service Manager.
 
 Right clicking on a Presentation file will bring up some of the same options.
 
@@ -254,29 +271,29 @@ Using the buttons you can:
   This brings up a dialog box to find your Image and list it in OpenLP.
 
 *Delete the selected Image:*
-  This removes your Image from the list. Please note: this will not delete the 
+  This removes your Image from the list. Please note: this will not delete the
   Image from your computer, just the OpenLP list.
 
 *Preview the selected Image:*
-  Sends your selected Image to the Preview window. 
+  Sends your selected Image to the Preview window.
 
 *Send the selected Image live:*
   This option will immediately display your selected Image live.
 
 *Add the selected Image to the service:*
-  This will enter your Image into the Service Manager. You can also click and 
+  This will enter your Image into the Service Manager. You can also click and
-  drag your Image over to the Service Manager. 
+  drag your Image over to the Service Manager.
 
 *Replace Live Background:*
-  With an Image selected, clicking this button will immediately replace the live 
+  With an Image selected, clicking this button will immediately replace the live
-  background being displayed with your selection. The Image will replace the theme 
+  background being displayed with your selection. The Image will replace the theme
   background until the theme changes or the "Remove Background" button is pressed.
 
 Right clicking on an Image file will bring up some of the same options.
 
 Media
 ^^^^^
-Media is an audio or video file. Generally if you can play or view your media 
+Media is an audio or video file. Generally if you can play or view your media
 on your computer without OpenLP, you can also play it in OpenLP.
 
 .. image:: pics/mediamanager_media.png
@@ -289,29 +306,29 @@ Using the buttons you can:
   This brings up a dialog box to find your Media and list it in OpenLP.
 
 *Delete the selected Media:*
-  This removes your Media from the list. Please note: this will not delete the 
+  This removes your Media from the list. Please note: this will not delete the
   Media from your computer, just the OpenLP list.
 
 *Preview the selected Media:*
-  Sends your selected Media to the Preview window. 
+  Sends your selected Media to the Preview window.
 
 *Send the selected Media live:*
   This option will immediately display your selected Media live.
 
 *Add the selected Media to the service:*
-  This will enter your Media into the Service Manager. You can also click and 
+  This will enter your Media into the Service Manager. You can also click and
-  drag your Media over to the Service Manager. 
+  drag your Media over to the Service Manager.
 
 *Replace Live Background:*
-  With a Media file selected, clicking this button will immediately replace the 
+  With a Media file selected, clicking this button will immediately replace the
   live background being displayed with your selection.
 
 Right clicking on a Media file will bring up some of the same options.
 
 Custom Slides
 ^^^^^^^^^^^^^
-Custom Slides gives you the option of creating your own slide. This is useful 
+Custom Slides gives you the option of creating your own slide. This is useful
-for displaying readings, liturgy or any text that may not be found in Songs or 
+for displaying readings, liturgy or any text that may not be found in songs or
 Bibles.
 
 .. image:: pics/mediamanager_custom.png
@@ -320,28 +337,31 @@ Using the buttons you can:
 
 .. image:: pics/mediamanager_custom_buttons.png
 
-*Add a new custom slide:*
+|buttons_new| *Add a new custom slide*
-  Brings up the dialog box to add a new Custom slide display. 
+    Brings up the dialog box to add a new custom slide.
 
-*Edit the selected custom slide:* 
+|buttons_edit| *Edit the selected custom slide:*
-  Brings up the dialog box to make changes to the custom slide.
+    Brings up the dialog box to make changes to the custom slide.
 
-*Delete the selected custom slide:*
+|buttons_delete| *Delete the selected custom slide*
-  Removes the custom slide from your list.
+    Removes the custom slide from your list.
 
-*Preview the selected custom slide:*
+|buttons_preview| *Preview the selected custom slide*
-  Lets you see what your Custom will look like displayed live.
+    Sends your custom slide to the :ref:`g-preview-slide-controller` to
+    see what it will look like when live.
 
-*Send the selected custom slide live:*
+|buttons_live| *Send the selected custom slide live*
-  This option will immediately display your custom slide live.
+    Immediately display your custom slide live, sending it to the
+    :ref:`g-live-slide-controller`.
 
-*Add the selected custom slide to the service:*
+|buttons_add| *Add the selected custom slide to the service*
-  This will enter your custom slide in the Service Manager. You can also drag 
+    This will add your custom slide to the :ref:`g-service-manager`. You can
-  your custom slide over to the Service Manager.
+    also drag your custom slide over to the :ref:`g-service-manager`.
 
-Right clicking on a custom slide file will bring up some of the same options.
+*Note:*
+    Right clicking on a custom slide will bring up some of the same options.
 
-When you Add a new custom slide a dialog box will appear. 
+When you Add a new custom slide a dialog box will appear.
 
 .. image:: pics/mediamanager_custom_edit.png
 
@@ -349,19 +369,19 @@ When you Add a new custom slide a dialog box will appear.
   Name of your custom slide.
 
 *Add:*
-  After clicking on Add you will enter your text you want to display in this box. 
+  After clicking on Add you will enter your text you want to display in this box.
-  To create multiple slides, click the Split Slide button. When you have finished 
+  To create multiple slides, click the Split Slide button. When you have finished
   adding your text, click on the Save button.
 
 *Theme:*
   Select the theme you want to use for your Custom slide from this drop down box.
 
 *Credits:*
-  Anything typed in this box will be displayed in the footer information on the 
+  Anything typed in this box will be displayed in the footer information on the
   display. When you are finished, click the :guilabel:`Save` button.
 
-To Edit your slide, click on :guilabel:`Edit` to edit part of it or 
+To Edit your slide, click on :guilabel:`Edit` to edit part of it or
-:guilabel:`Edit All` if you need to make multiple changes. Use the Up and Down 
+:guilabel:`Edit All` if you need to make multiple changes. Use the Up and Down
 arrows to change the arrangement of your custom slide.
 
 .. These are all the image templates that are used in this page.
@@ -384,3 +404,6 @@ arrows to change the arrangement of your custom slide.
 
 .. |BUTTONS_OPEN| image:: pics/buttons_open.png
 
+.. |BUTTONS_KEEP_RESULTS| image:: pics/buttons_keep_results.png
+
+.. |BUTTONS_CLEAR_RESULTS| image:: pics/buttons_clear_results.png

manual/source/troubleshooting.rst

@@ -6,7 +6,7 @@ I can not play videos or other media
 ------------------------------------
 
 If you can not play video or audio through openlp, there are several areas that
-could be an issue. First thing is to make sure you can play the media file 
+could be an issue. First thing is to make sure you can play the media file
 through your default media player. OpenLP should be able to play any file that
 you can play through your default media player.
 
@@ -20,43 +20,43 @@ Make sure the check box for `Use Phonon for video playback` is checked.
 Codecs
 ^^^^^^
 
-You may need to install codecs for certain files to play. Most newer versions 
+You may need to install codecs for certain files to play. Most newer versions
-of Windows and OS X will support most media types. Most Linux distributions 
+of Windows and OS X will support most media types. Most Linux distributions
 will require a little more help to get certain media types to play.
 
 Microsoft Windows
 ^^^^^^^^^^^^^^^^^
 
-Later versions of Microsoft Windows (Vista, Windows 7) generally come with 
+Later versions of Microsoft Windows (Vista, Windows 7) generally come with
-everything you need to play most media formats. If for some reason you need 
+everything you need to play most media formats. If for some reason you need
 additional codecs we have seen success from the `Combined Community Codec Pack
 (CCCP) <http://www.cccp-project.net/>`_.  You might also wish to check out the
-K-Lite Codec Pack. If you are having issues, results do seem to vary with the 
+K-Lite Codec Pack. If you are having issues, results do seem to vary with the
-different options. What works for some may not for others, so some trial and 
+different options. What works for some may not for others, so some trial and
 error may be required.
 
 Mac
 ^^^
 
 If you are using a Mac. You may wish to play Windows formats. flip4mac enables
-you to use popular Windows formats such as .wmv on your Mac. You can get it 
+you to use popular Windows formats such as .wmv on your Mac. You can get it
 `from here <http://dynamic.telestream.net/downloads/download-flip4macwmv.htm>`_.
 
 Ubuntu Linux (and variants)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 If you are using Ubuntu Linux, or one of its variants (Kubuntu, Edubuntu, etc...)
-it is a fairly quick and easy process to get all the codecs you need to make 
+it is a fairly quick and easy process to get all the codecs you need to make
-things work. You will need to install two meta-packages that contain all the 
+things work. You will need to install two meta-packages that contain all the
 multimedia codecs that you will generally need. From the Software Center install
 ubuntu-restricted-extras and Kubuntu-restricted-extras, or from the terminal::
- 
+
   user@linux:~ $ sudo apt-get install ubuntu-restricted-extras kubuntu-restricted-extras
 
 **Note** if you are running Kubuntu there is no need to install the
 ubuntu-restricted-extras meta-package
 
-For more information on Ubuntu and multimedia issues please check out the 
+For more information on Ubuntu and multimedia issues please check out the
 `community documentation <https://help.ubuntu.com/community/RestrictedFormats/>`_.
 
 Arch Linux
@@ -64,7 +64,7 @@ Arch Linux
 
 The following command provides the most complete solution for codecs on Arch
 Linux::
-  
+
   root@linux:~ # pacman -S gstreamer0.10-{base,good,bad,ugly}-plugins gstreamer0.10-ffmpeg
 
 If you need more help with Arch Linux and multimedia please see the `Arch Linux
@@ -89,9 +89,9 @@ Then install the following packages::
 Fedora Linux
 ^^^^^^^^^^^^
 You will need to set up Fedora to play most media formats. This is relatively
-simple using the rpmfusion repository. 
+simple using the rpmfusion repository.
 
-**Note** the following commands will enable a third party repository to your 
+**Note** the following commands will enable a third party repository to your
 system. Please check out `the RPM Fusion site <http://rpmfusion.org>`_ for more information.
 
 To enable both the free and nonfree components for any Fedora official release
@@ -103,14 +103,14 @@ After enabling the rpmfusion repository you will want to refresh your package
 list, perform any updates and search for gstreamer-good, bad, and ugly and
 install.
 
-Follow the tutorial `using the rpmfusion repository <http://www.linuxjournal.com/video/getting-mp3-support-fedora-using-rpmfusion-repositories>`_ 
+Follow the tutorial `using the rpmfusion repository <http://www.linuxjournal.com/video/getting-mp3-support-fedora-using-rpmfusion-repositories>`_
 to enable extra audio and video formats on Fedora
 
 The Media Manager appears to be missing some features
 -----------------------------------------------------
 
 If you do not see all the features listed in the Media Manager, you may need
-to enable them. 
+to enable them.
 
 To enable the plugins navigate to :menuselection:`Settings --> Plugins` or
 press :kbd:`Alt+F7`. You will want to click on the plugin to the left that you
@@ -125,7 +125,7 @@ I can not see the book, chapter, and verse when I display scripture
 -------------------------------------------------------------------
 
 The book, chapter, and verse should be displayed when you display scripture. If
-you can not see this your theme probably has the text size too small for the 
+you can not see this your theme probably has the text size too small for the
 info to be seen. See the section of the manual on :ref:`themes` if you need more info
 on text sizes in themes.
 
@@ -153,7 +153,7 @@ has fixed this problem according to some of our users.
 I have JPG images and they will not work on my system
 -----------------------------------------------------
 
-This is a known issue on some Mac OS X 10.5 systems and on a few Windows XP 
+This is a known issue on some Mac OS X 10.5 systems and on a few Windows XP
 systems. Currently the only solution is to convert your images into another
 format. We would suggest using PNG images when possible with OpenLP.
 
@@ -164,16 +164,17 @@ This seems to be a problem with XFCE and some versions of Gnome too. To correct
 this problem, open  a terminal and type in the following commands::
 
   gconftool-2 --type boolean --set /desktop/gnome/interface/buttons_have_icons true
-  
+
   gconftool-2 --type boolean --set /desktop/gnome/interface/menus_have_icons true
 
 I chose to use a web Bible but it did not download the entire Bible
 -------------------------------------------------------------------
 
 Due to copyright restrictions OpenLP cannot download an entire Bible. It can
-only download the section you search for. If you do not have an internet 
+only download the section you search for. If you do not have an internet
 connection where you intend to use OpenLP you will need another scripture
-source. For more information about acquiring Bibles please see :ref:`bibleimporter`.
+source. For more information about acquiring Bibles please see the section on
+the :ref:`bibles-import`.
 
 OpenLP is using a large amount of RAM when showing a presentation
 -----------------------------------------------------------------
@@ -190,7 +191,7 @@ about 20 slides.
 OpenLP is not displaying correctly, or is not on the correct screen
 -------------------------------------------------------------------
 
-Please read the documentation on :ref:`dualmonitors`. It is very important to 
+Please read the documentation on :ref:`dualmonitors`. It is very important to
 have dual monitors setup properly for OpenLP to function as expected.