Various cleanups, linkages, and whatnot.

manual/source/bibles.rst

@@ -5,10 +5,10 @@ Bibles
 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
 package, you may be able to convert your existing database to work in OpenLP

manual/source/creating_service.rst

@@ -4,10 +4,10 @@ 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
 
@@ -23,8 +23,8 @@ 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
 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
-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
 

manual/source/glossary.rst

@@ -8,46 +8,55 @@ 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
 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
 with them.
 
 .. image:: pics/preview.png
 
-.. _service-file:
+.. _g-service-file:
 
 Service File
 ------------
@@ -55,14 +64,14 @@ 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
 --------------
@@ -73,7 +82,7 @@ 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,13 +1,13 @@
-.. _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
 --------------------
@@ -35,8 +35,9 @@ 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
 
@@ -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.
 
-*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
 
@@ -125,8 +139,9 @@ Using the buttons you can:
 
 *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.
+    *Scripture Reference* or *Text Search*.
 
     *Scripture Reference*
         You may search for a specific verse using this format below.
@@ -143,10 +158,11 @@ 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.
 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
@@ -154,26 +170,27 @@ Second version will be displayed on the next slide.
 
 Click the :guilabel:`Search` button to display your results in the box below.
 
-
+*Layout style*
-**Layout style**
-
     There are three options to determine how your Bible verses are displayed.
 
-* *Verse Per Slide* will display one verse per slide.
+    *Verse Per Slide*
-* *Verse Per Line* will start each verse on a new line until the slide is full.
+        This will display one verse per slide.
-* *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.
 
-*Note: Changes to Layout Style do not affect verses already in the Service Manager.*
+    *Verse Per Line*
+        This will start each verse on a new line until the slide is full.
+
+    *Continuous*
+        This 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.
+
+    *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.
-
-.. image:: pics/mediamanager_bibles_lock.png 
-.. 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
@@ -219,17 +236,17 @@ 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:*
@@ -311,7 +328,7 @@ 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
-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,26 +337,29 @@ 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.
 
-*Delete the selected custom slide:*
+|buttons_delete| *Delete the selected custom slide*
     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.
 
@@ -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

@@ -173,7 +173,8 @@ 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
 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
 -----------------------------------------------------------------