adding inline images to and cleaning up of several things.

bzr-revno: 17

manual/source/bibles.rst

@@ -5,17 +5,20 @@ Bibles
 Managing Bibles in OpenLP is a relatively simple process. There are also
 converters provided to get data from other formats into OpenLP.
 
-.. _bibleimporter:
+.. _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
 2.0. To access the Bible Importer :menuselection:`File --> Import --> Bible`.
 You may also enter the Bible Importer by clicking the :guilabel:`Import Icon:`
 
-.. image:: pics/themeimportexport.png
+|importicon| Import Bibles
+    Click on the :guilabel:`Import Bibles` icon to start the Bible import wizard.
+
+.. |IMPORTICON| image:: pics/themeimportexport.png
 
 You will see the Bible Importer window, click :guilabel:`Next`.
 

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, images, 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/custom_slides.rst

@@ -0,0 +1,27 @@
+.. _custom-slides:
+
+Custom Slides
+=============
+
+Adding a new custom slide displays the following dialog:
+
+.. image:: pics/mediamanager_custom_edit.png
+
+**Title**
+    Name of your custom slide.
+
+**Add**
+    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 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
+  display. When you are finished, click the :guilabel:`Save` button.
+
+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
+arrows to change the arrangement of your custom slide.

manual/source/glossary.rst

@@ -1,3 +1,5 @@
+.. _glossary:
+
 ========
 Glossary
 ========
@@ -6,52 +8,73 @@ 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.
 
+.. _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
 -------------
 
-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 Pane
+------------
 
 The preview pane is a section to preview your media items before you go live
 with them.
 
 .. image:: pics/preview.png
 
+.. _g-service-file:
+
 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**
 
+.. _g-service-item:
+
 Service Item
 ------------
 
 Service items are the **media items** that are in the **service manager**
 
-Service Manger
+.. _g-service-manager:
---------------
+
+Service Manager
+---------------
 
 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
@@ -59,6 +82,8 @@ services files from here.
 
 .. image:: pics/servicemanager.png
 
+.. _g-slide-controller:
+
 Slide Controller
 ----------------
 
@@ -67,6 +92,24 @@ being displayed, and moving between the various slides.
 
 .. image:: pics/slidecontroller.png
 
+.. _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/index.rst

@@ -1,8 +1,3 @@
-.. OpenLP documentation master file, created by
-   sphinx-quickstart on Thu Sep 30 21:24:54 2010.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
 Welcome to the OpenLP 2.0 User Manual
 =====================================
 
@@ -25,14 +20,15 @@ Reference Manual
 .. toctree::
    :maxdepth: 2
 
-   alert
+   wizard
-   bibles
    configure
    dualmonitors
-   wizard
    mediamanager
-   songs
    themes
+   songs
+   bibles
+   custom_slides
+   alert
    glossary
 
 Questions and Troubleshooting

manual/source/mediamanager.rst

@@ -1,355 +1,385 @@
-.. _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 **Media Manager**. The
+your :ref:`g-service-manager`. This will all happen through the
-Media Manager contains all the Bibles, Songs, Presentations, Media, and Custom 
+:ref:`g-media-manager`. The :ref:`g-media-manager` contains all the Bibles,
-Slides that you will project through OpenLP.
+Songs, Presentations, Media, and Custom Slides that you will project through
+OpenLP.
 
-Enabling the Plugins
+If you don't see the "Songs", "Bibles" and other media items in the
---------------------
+:ref:`g-media-manager`, then refer to :ref:`t-no-media-items` in the
-
+troubleshooting guide.
-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 
-enabled.
-
-.. image:: pics/mediamanager_songs.png
-
-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
-would like to enable and select *Active* from the drop down box to the right.
-
-.. image:: pics/plugins.png
-
-
-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 
-capable of displaying.
 
 Songs
-^^^^^
+-----
-Clicking on Songs in the Media Manager will display all of the songs you have 
+
-added by Title and Author/Authors.
+Clicking on *Songs* in the :ref:`g-media-manager` will display the songs media
+item. The songs media item shows a list of all the songs in the songs database.
 
 .. image:: pics/mediamanager_songs.png
 
-Using the buttons you can: 
+Toolbar
+^^^^^^^
 
-.. image:: pics/mediamanager_songs_buttons.png
+|buttons_new| **Add song**
+    Open the song edit dialog to add a new song.
 
-*Add a song:*
+|buttons_edit| **Edit song**
-  Brings up the dialog box to add a new song
+    Open the song edit dialog to make changes to the selected song.
 
-*Edit the selected song:*
+|buttons_delete| **Delete song**
-  Brings up the dialog box to make changes to the song
+    Remove the selected song(s) from the song list.
 
-*Delete the selected song:*
+|buttons_preview| **Preview song**
-  Removes the song from your song list
+    Send the selected song to the :ref:`g-preview-slide-controller`.
 
-*Preview the selected song:*
+|buttons_live| **Send song live**
-  Lets you see what your song will look like displayed live
+    Send the selected song to the :ref:`g-live-slide-controller` to be shown on
+    the display screen.
 
-*Send the selected song live:*
+|buttons_add| **Add song to service**
-  This option will immediately display your song live.
+    Add the selected song(s) to the :ref:`g-service-manager`. Songs can also be
+    added to the :ref:`g-service-manager` by means of drag and drop from the
+    :ref:`g-media-manager`.
 
-*Add the selected Song to the service:*
+|buttons_db| **Maintain authors, topics and books**
-  This will enter your song in the Service Manager. You can also drag your song 
+    Open the song maintenance dialog to add, edit or delete authors, topics or
-  over to the Service Manager.
+    song books.
 
-*Maintain the list of authors, topics and books:*
+**Note:** Right-clicking on a song in the list will display some of the same
-  Brings up a dialog box to edit Authors, Topics or Song Books. 
+options.
-  Note: Right clicking on a song file will bring up some of the same options.
 
-*Search:*
+Search
-  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.
+Clicking on the icon in the search box displays a list of search options. The
+following options are available:
 
-* *Entire Song:* This option will search Titles, Lyrics and Comments.
+|search_song| **Entire Song**
-* *Titles:* This option will search Titles only.
+    Search the title, lyrics and comments fields.
-* *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.
+|search_title| **Titles**
+    Search the title field only.
+
+|search_text| **Lyrics**
+    Search the lyrics field only.
+
+|search_author| **Authors**
+    Search the associated authors.
+
+|search_theme| **Themes**
+    Search the assigned themes.
+
+Click the :guilabel:`Search` button to perform a search and display the results
+in the song list.
 
 Bibles
-^^^^^^
+------
-Clicking on Bibles in the Media Manager will display your options for searching 
+
-and adding chapters and verses to the Service Manager.
+Clicking on *Bibles* in the :ref:`g-media-manager` will display the Bibles media
+item. The Bibles media item shows Bible verses and provides a search function
+to find Bible verses and add them to the :ref:`g-service-manager`.
 
 .. image:: pics/mediamanager_bibles.png
 
-Using the buttons you can:
+Toolbar
+^^^^^^^
 
-.. image:: pics/mediamanager_bibles_buttons.png
+|buttons_import| **Import Bible**
+    Import Bibles from a number of formats. This is discussed in detail on the
+    :ref:`bibles-import` page.
 
-*Import a Bible:*
+|buttons_preview| **Preview verses**
-  This is discussed in detail on the Bible Importer page in the manual. 
+    Send the selected verses to the :ref:`g-preview-slide-controller`.
 
-*Preview the selected Bible:*
+|buttons_live| **Send verses live**
-  Sends your selected verses to the Preview window 
+    Send the selected verses to the :ref:`g-live-slide-controller` to be shown
+    on the display screen.
 
-*Send the selected Bible live:*
+|buttons_add| **Add verses to service**
-  This option will immediately display your selected verses live.
+    Add the selected verses to the :ref:`g-service-manager`. Verses can also be
+    added to the :ref:`g-service-manager` by means of drag and drop from the
+    :ref:`g-media-manager`.
 
-*Add the selected Bible to the service:*
+**Note:** Right-clicking on a selection of verses will display some of the
-  This will enter your verses into the Service Manager. You can also click and 
+same options.
-  drag your verses over to the Service Manager. 
 
-**Quick** tab
+Quick Search Tab
+^^^^^^^^^^^^^^^^
 
 .. image:: pics/mediamanager_bibles_quick.png
 
+The following options are available on the quick search tab:
+
 **Find**
+    Clicking the icon in the Find box displays a list of search options. The
+    following options are available:
 
-You will type your search query in this box for the following two searches. 
+    |search_reference| **Scripture Reference**
-Clicking the icon in the Find box will give you the choice of searching by 
+        Search for a specific verse using a scripture reference format. The following formats are supported:
-Scripture Reference or Text Search.
 
-*Scripture Reference:*
+        * Book Chapter
-You can search for a specific verse using this format below. 
+        * Book Chapter-Chapter
+        * Book Chapter:Verse-Verse
+        * Book Chapter:Verse-End (this will display verses to the end of the chapter)
+        * Book Chapter:Verse-Verse, Verse-Verse
+        * Book Chapter:Verse-Verse, Chapter:Verse-Verse
+        * Book Chapter:Verse-Chapter:Verse
 
-* Book Chapter 
+    |search_text| **Text Search**
-* Book Chapter-Chapter
+        Search by a keyword or words. Use more words to narrow down the list
-* Book Chapter:Verse-Verse
+        of results.
-* Book Chapter:Verse-End (this will display verses to the end of the chapter)
-* Book Chapter:Verse-Verse, Verse-Verse
-* Book Chapter:Verse-Verse, Chapter:Verse-Verse
-* Book Chapter:Verse-Chapter:Verse
-
-*Text Search*
-  You can also search by a keyword or words. The more words you use for the 
-  search, the more you will narrow down your results.
 
 **Version**
-
+    Once a Bible has been imported, it will be displayed in the drop down box.
-Once you have imported a Bible, it will be displayed in the Version 
+    Select a version from the list of the Bibles.
-drop down box. Select the version of the Bible you want to use here.
     
 **Second**
+    If :guilabel:`Display second Bible verses` has been selected in the Bibles
+    configuration, this option will be available. This is used to display
+    another version of the Bible for comparison. Both versions will be
+    displayed. If there is not enough space on one slide, the Second verses
+    will be displayed on the next slide.
     
-If you have “Display second Bible verses” selected in 
+**Layout Style**
-:menuselection:`Configure OpenLP --> Bibles` tab, this choice will be visible. 
+    The following options are available to set how Bible verses are displayed:
-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 
-Second version will be displayed on the next slide.
 
-Click the :guilabel:`Search` button to display your results in the box below.
+    **Verse Per Slide**
+        Display one verse per slide.
 
+    **Verse Per Line**
+        Start each verse on a new line until the slide is full.
 
-**Layout style**
+    **Continuous**
+        Verses flow together, separated by verse number and chapter
+        if chapter is selected to show above.
 
-There are three options to determine how your Bible verses are displayed. 
+    This setting is also accessible in :menuselection:`Setttings --> Configure OpenLP`
+    on the *Bibles* tab.
 
-* *Verse Per Slide* will display one verse per slide.
+    **Note:** Changes to layout style do not affect verses already in the
-* *Verse Per Line* will start each verse on a new line until the slide is full.
+    :ref:`g-service-manager`.
-* *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.*
+|buttons_clear_results| |buttons_keep_results| **Keep/Clear Results**
+    Normally, when a search is run, the previous verses are cleared. To retain
+    the previous set of verses, toggle this button.
 
-Each search you make will display your verses in the box below.
+Click the :guilabel:`Search` button to perform a search and display the results
+in the verse list.
 
-.. image:: pics/mediamanager_bibles_results.png
+Advanced Tab
-
+^^^^^^^^^^^^
-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 
-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 Bible verses by book, chapter and
-number.
+verse from a set of drop down boxes.
 
-*Book:*
+**Book**
-  Click on the drop down box and select the book you want to display. 
+    Click on the drop down box and select a book from the list.
 
-*Chapter: Verse:*
+**Chapter/Verse**
-  Select your chapter From and To and Verse From and To.
+    Select the *From* chapter and verse, and the *To* chapter and verse.
 
-Version and Second are the same as in Quick tab above. Click on each box and 
+*Version*, *Second* and *Layout Style* are the same as in the *Quick* search
-select the version you wish to display and Second version if you wish to display 
+tab.
-an alternative version for comparison.
 
-**Layout style**
+Click the :guilabel:`Search` button to perform a search and display the results
+in the verse list.
 
-There are three options to determine how your Bible verses are displayed. 
+.. image:: pics/mediamanager_bibles_results.png
-
-* *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.
-* *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.*
-
-Click the :guilabel:`Search` button to display your results in the box below.
-
-Each search you make will display your verses in the box below.
 
 Presentations
-^^^^^^^^^^^^^
+-------------
+
+Clicking on *Presentations* in the :ref:`g-media-manager` will display the
+presentations media item. The presentations media item shows a list of imported
+presentations.
 
 .. image:: pics/mediamanager_presentations.png
 
-Using the buttons you can:
+Toolbar
+^^^^^^^
 
-.. image:: pics/mediamanager_presentations_buttons.png
+|buttons_open| **Load presentation**
+    Import a presentation. Presentations need to be imported in order to
+    control them from within OpenLP.
 
-*Load a new presentation:*
+|buttons_delete| **Delete presentation**
-  This brings up a dialog box to find your presentation and list it in OpenLP.
+    Removes the selected presentation from the list. Note that this does not
+    delete the original presentation from the disk.
 
-*Delete the selected Presentation:*
+|buttons_preview| **Preview presentation**
-  This removes your Presentation from the list. Please note: this will not delete 
+    Send the selected presentation to the :ref:`g-preview-slide-controller`.
-  the presentation from your computer, only from the OpenLP list.
 
-*Preview the selected Presentation:*
+|buttons_live| **Send presentation live**
-  Sends your selected Presentation to the Preview window 
+    Send the selected presentation to the :ref:`g-live-slide-controller` to be
+    shown on the display screen.
 
-*Send the selected Presentation live:*
+|buttons_add| **Add presentation to service**
-  This option will immediately display your selected Presentation live.
+    Add the selected presentation to the :ref:`g-service-manager`. Presentations
+    can also be added to the :ref:`g-service-manager` by means of drag and drop
+    from the :ref:`g-media-manager`.
 
-*Add the selected Presentation to the service:*
+**Note:** Right-clicking on a presentation will display some of the same options.
-  This will enter your Presentation into the Service Manager. You can also click 
-  and drag your Presentation over to the Service Manager. 
-
-Right clicking on a Presentation file will bring up some of the same options.
 
 Images
-^^^^^^
+------
+
+Clicking on *Images* in the :ref:`g-media-manager` will display the images
+media item. The images media item shows a list of imported images.
 
 .. image:: pics/mediamanager_images.png
 
-Using the buttons you can:
+Toolbar
+^^^^^^^
 
-.. image:: pics/mediamanager_images_buttons.png
+|buttons_open| **Load image**
+    Import one or more images. Images need to be imported in order to be used
+    in OpenLP.
 
-*Load a new Image:*
+|buttons_delete| **Delete images**
-  This brings up a dialog box to find your Image and list it in OpenLP.
+    Removes the selected image(s) from the list. Note that this does not
+    delete the original image(s) from the disk.
 
-*Delete the selected Image:*
+|buttons_preview| **Preview image**
-  This removes your Image from the list. Please note: this will not delete the 
+    Send the selected image(s) to the :ref:`g-preview-slide-controller`.
-  Image from your computer, just the OpenLP list.
 
-*Preview the selected Image:*
+|buttons_live| **Send image live**
-  Sends your selected Image to the Preview window. 
+    Send the selected image(s) to the :ref:`g-live-slide-controller` to be
+    shown on the display screen.
 
-*Send the selected Image live:*
+|buttons_add| **Add image to service**
-  This option will immediately display your selected Image live.
+    Add the selected image(s) to the :ref:`g-service-manager`. Images can also
+    be added to the :ref:`g-service-manager` by means of drag and drop from the
+    :ref:`g-media-manager`.
 
-*Add the selected Image to the service:*
+|buttons_replace_live_background| **Replace live background**
-  This will enter your Image into the Service Manager. You can also click and 
+    Replace the current live theme background with the selected image. This
-  drag your Image over to the Service Manager. 
+    has effect until the theme changes, or the *Remove Backgound* button is
+    clicked.
 
-*Replace Live Background:*
+**Note:** Right-clicking on an image will display some of the same options.
-  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 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 
+
-on your computer without OpenLP, you can also play it in OpenLP.
+Clicking on *Media* in the :ref:`g-media-manager` will display the media item
+for media. The media item shows a list of imported audio or video files.
+
+**Note:** On some computers OpenLP has trouble displaying videos. Please read
+the `Frequently Asked Questions <http://wiki.openlp.org/faq>`_ for tips on how
+to resolve these issues.
 
 .. image:: pics/mediamanager_media.png
 
-Using the buttons you can:
+Toolbar
+^^^^^^^
 
-.. image:: pics/mediamanager_media_buttons.png
+|buttons_open| **Load media**
+    Import one or more media files. Media files need to be imported in order to
+    be used in OpenLP.
 
-*Load a new Media:*
+|buttons_delete| **Delete media**
-  This brings up a dialog box to find your Media and list it in OpenLP.
+    Removes the selected media file(s) from the list. Note that this does not
+    delete the original media file(s) from the disk.
 
-*Delete the selected Media:*
+|buttons_preview| **Preview media**
-  This removes your Media from the list. Please note: this will not delete the 
+    Send the selected media to the :ref:`g-preview-slide-controller`.
-  Media from your computer, just the OpenLP list.
 
-*Preview the selected Media:*
+|buttons_live| **Send media live**
-  Sends your selected Media to the Preview window. 
+    Send the selected media to the :ref:`g-live-slide-controller` to be shown
+    on the display screen.
 
-*Send the selected Media live:*
+|buttons_add| **Add media to service**
-  This option will immediately display your selected Media live.
+    Add the selected media to the :ref:`g-service-manager`. Media can also be
+    added to the :ref:`g-service-manager` by means of drag and drop from the
+    :ref:`g-media-manager`.
 
-*Add the selected Media to the service:*
+|buttons_replace_live_background| **Replace live background**
-  This will enter your Media into the Service Manager. You can also click and 
+    Replace the current live theme background with the selected media. This
-  drag your Media over to the Service Manager. 
+    has effect until the theme changes, or the *Remove Backgound* button is
+    clicked.
 
-*Replace Live Background:*
+**Note:** Right-clicking on a media file will display some of the same options.
-  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 
+
-for displaying readings, liturgy or any text that may not be found in Songs or 
+Clicking on *Custom Slides* in the :ref:`g-media-manager` will display the
-Bibles.
+custom slides media item. The custom slides media item shows a list of custom
+textual items. Custom slides are useful for creating unstructured text items,
+such as liturgy or prayers.
 
 .. image:: pics/mediamanager_custom.png
 
-Using the buttons you can:
+Toolbar
+^^^^^^^
 
-.. image:: pics/mediamanager_custom_buttons.png
+|buttons_new| **Add custom slide**
+    Open the song edit dialog to add a new custom slide.
 
-*Add a new custom slide:*
+|buttons_edit| **Edit custom slide**
-  Brings up the dialog box to add a new Custom slide display. 
+    Open the song edit dialog to make changed to the selected new custom slide.
 
-*Edit the selected custom slide:* 
+|buttons_delete| **Delete custom slide**
-  Brings up the dialog box to make changes to the custom slide.
+    Remove the selected custom slide(s) from the list.
 
-*Delete the selected custom slide:*
+|buttons_preview| **Preview custom slide**
-  Removes the custom slide from your list.
+    Send the selected custom slide to the :ref:`g-preview-slide-controller`.
 
-*Preview the selected custom slide:*
+|buttons_live| **Send custom slide live**
-  Lets you see what your Custom will look like displayed live.
+    Send the selected custom slide to the :ref:`g-live-slide-controller` to be
+    shown on the display screen.
 
-*Send the selected custom slide live:*
+|buttons_add| **Add custom slide to service**
-  This option will immediately display your custom slide live.
+    Add the selected custom slide(s) to the :ref:`g-service-manager`. Custom
+    slides can also be added to the :ref:`g-service-manager` by means of drag
+    and drop from the :ref:`g-media-manager`.
 
-*Add the selected custom slide to the service:*
+**Note:** Right-clicking on a custom slide in the list will display some of the
-  This will enter your custom slide in the Service Manager. You can also drag 
+same options.
-  your custom slide over to the Service Manager.
 
-Right clicking on a custom slide file will bring up some of the same options.
+.. These are all the image templates that are used in this page.
 
-When you Add a new custom slide a dialog box will appear. 
+.. |BUTTONS_NEW| image:: pics/buttons_new.png
 
-.. image:: pics/mediamanager_custom_edit.png
+.. |BUTTONS_EDIT| image:: pics/buttons_edit.png
 
-*Title:*
+.. |BUTTONS_DELETE| image:: pics/buttons_delete.png
-  Name of your custom slide.
 
-*Add:*
+.. |BUTTONS_PREVIEW| image:: pics/buttons_preview.png
-  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 
-  adding your text, click on the Save button.
 
-*Theme:*
+.. |BUTTONS_LIVE| image:: pics/buttons_live.png
-  Select the theme you want to use for your Custom slide from this drop down box.
 
-*Credits:*
+.. |BUTTONS_ADD| image:: pics/buttons_add.png
-  Anything typed in this box will be displayed in the footer information on the 
+
-  display. When you are finished, click the :guilabel:`Save` button.
+.. |BUTTONS_DB| image:: pics/buttons_db.png
+
+.. |BUTTONS_IMPORT| image:: pics/buttons_import.png
+
+.. |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
+
+.. |BUTTONS_REPLACE_LIVE_BACKGROUND| image:: pics/buttons_replace_live_background.png
+
+.. |SEARCH_SONG| image:: pics/search_song.png
+
+.. |SEARCH_TITLE| image:: pics/search_title.png
+
+.. |SEARCH_AUTHOR| image:: pics/search_author.png
+
+.. |SEARCH_THEME| image:: pics/search_theme.png
+
+.. |SEARCH_REFERENCE| image:: pics/search_reference.png
+
+.. |SEARCH_TEXT| image:: pics/search_text.png
 
-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 
-arrows to change the arrangement of your custom slide.

manual/source/troubleshooting.rst

@@ -2,6 +2,8 @@
 Troubleshooting
 ===============
 
+.. _t-no-media:
+
 I can not play videos or other media
 ------------------------------------
 
@@ -106,6 +108,8 @@ install.
 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
 
+.. _t-no-media-items:
+
 The Media Manager appears to be missing some features
 -----------------------------------------------------
 
@@ -173,7 +177,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
 -----------------------------------------------------------------