Merge branch 'master' into 'master'

Service doc updated

See merge request openlp/documentation!28

manual/source/bibles.rst

@@ -362,7 +362,7 @@ Selecting the :guilabel:`Search` button activates the search.
 .. pictures used in this page
 
 .. |DELETEICON| image:: pics/theme_delete.png
-.. |BIBLELIVE| image:: pics/system_live.png
+.. |BIBLELIVE| image:: pics/buttons_live.png
 .. |BIBLEPREVIEW| image:: pics/general_preview.png
 .. |BIBLEEDIT| image:: pics/songs13.png
 .. |BIBLEADD| image:: pics/buttons_add.png

manual/source/configure.rst

@@ -184,6 +184,7 @@ Slide Controller
   a group of images, verses, or the lyrics in a song. This control timer is 
   also accessible on the :ref:`using_timer`
 
+.. _configure_service_item_wrapping:
 
 Service Item Wrapping
 ^^^^^^^^^^^^^^^^^^^^^
@@ -573,6 +574,8 @@ Songs
 
 .. image:: pics/configuresongs.png
 
+.. _configure-song-related-settings:
+
 Song related settings
 ^^^^^^^^^^^^^^^^^^^^^
 

manual/source/menu_items.rst

@@ -19,52 +19,52 @@ File
 |buttons_save| **Save Service** 
     Saves your existing loaded service.
 
-**Save Service As:** 
+**Save Service As** 
     Saves your newly created service.
 
-**Recent Services:** 
+**Recent Services** 
     Displays your last files opened configurable here. :ref:`configure_ui`
 
-  **Clear List:** 
+  **Clear List** 
     Clears your recent files list.
 
-|buttons_import| **Import:** 
+|buttons_import| **Import** 
   This provides the items you can import.
 
-  **Settings:** 
+  **Settings** 
     Import your configurable settings from another computer. Learn more about 
     :ref:`backing_up`.
 
-  **Theme:** 
+  **Theme** 
     Import a theme that has been previously exported. :ref:`import_themes`
 
-  **Song:** 
+  **Song** 
     Import your songs previously exported. :ref:`import_songs`
 
-  **CCLI SongSelect:** 
+  **CCLI SongSelect** 
     Import your songs from CCLI SongSelect. :ref:`import_songs`
 
-  **Bible:** 
+  **Bible**
     Import Bibles from another program, the internet or a previously exported 
     Bible from OpenLP. :ref:`import_bibles`
 
-|buttons_export| **Export:** 
+|buttons_export| **Export** 
   Provides the items you can export.
 
-  **Settings:** 
+  **Settings**
     Export your configurable settings to a file to import to another computer. 
     Learn more about :ref:`backing_up`.
 
-  **Theme:** 
+  **Theme**
     Export your theme. :ref:`export_themes`
 
-  **Song:** 
+  **Song** 
     Export your songs. :ref:`export_songs`
 
-**Print Service:** 
+**Print Service** 
     Gives you the ability to print your service. :ref:`print_service`
 
-|buttons_exit| **Exit:** 
+|buttons_exit| **Exit** 
     Closes OpenLP. If there is an open service that has not 
     been saved you will be prompted to do so.
 
@@ -73,39 +73,39 @@ File
 View
 ----
 
-**Layout Presets:** 
+**Layout Presets** 
   These three settings are optimized for setup and live display.
 
-  **Show all:** 
+  **Show all** 
     Displays all of the panels of OpenLP. 
 
-  **Setup:** 
+  **Setup** 
     Displays Preview, :ref:`library` and :ref:`creating_service`.
 
-  **Live:** 
+  **Live** 
     Displays the live panel and :ref:`creating_service`
 
 Clicking on any of the next items will hide or show its respective panel.
 
-|button_mediamanager| **Library:** 
+|button_mediamanager| **Library** 
     Hide or show :ref:`library`.
 
-|button_projectormanager| **Projector Controller:** 
+|button_projectormanager| **Projector Controller** 
     Hide or show :ref:`projector`.
 
-|button_servicemanager| **Service:** 
+|button_servicemanager| **Service** 
     Hide or show :ref:`creating_service`.
 
-|theme_new| **Themes:** 
+|theme_new| **Themes** 
     Hide or show :ref:`themes`.
 
-**Preview:** 
+**Preview** 
     Hide or show the preview panel.
 
-**Live:** 
+**Live** 
     Hide or show the live panel.
 
-**Lock visibility of the panels:** 
+**Lock visibility of the panels** 
     Using this lock will keep all your panel settings the way they 
     are when clicked, whether hidden or showing. Click this again to unlock the 
     panels.
@@ -113,44 +113,44 @@ Clicking on any of the next items will hide or show its respective panel.
 Tools
 -----
 
-|buttons_open| **Open Data Folder:** 
+|buttons_open| **Open Data Folder** 
     You can access your OpenLP data here. Your Bibles, songs, themes and other 
     items are stored here. 
   
 **Note:** It is possible to delete a Bible, theme or another resource you need. 
 If anything is deleted in this folder it is not recoverable through OpenLP.
 
-|button_rerun| **Re-run First Time Wizard:** 
+|button_rerun| **Re-run First Time Wizard** 
     This will bring up the dialog box to run the first time wizard again. :ref:`wizard`
 
-**Update Theme Images:** 
+**Update Theme Images** 
     Changing screen resolution can have an affect on theme images. Use this to 
     correct the images. 
 
-**Songs:**
+**Songs**
 
-  |plugin_songs| **Re-index Songs:** 
+  |plugin_songs| **Re-index Songs** 
     This rebuilds the internal song indexes to make them work following code 
     corrections. You would generally use this after a software upgrade.
 
-  **Find Duplicate Songs:**
+  **Find Duplicate Songs**
     Start wizard for detecting and removing duplicate songs.
  
-  **Songs List Report:**
+  **Songs List Report**
     This creates CSV file with song database.
 
 
-**Song Usage Tracking:** 
+**Song Usage Tracking** 
     Configure your song usage tracking. :ref:`song_usage`
 
-  **Toggle Tracking:** 
+  **Toggle Tracking** 
     Provides the means to turn song usage tracking on or off. There will be a 
     visible check mark if song usage tracking is on.
 
-  **Extract Tracking Data:** 
+  **Extract Tracking Data** 
     Brings up a dialog box to extract song usage data.
 
-  **Delete Tracking Data:** 
+  **Delete Tracking Data** 
     Brings up a dialog box to delete song usage data.
 
 |plugin_alerts| **Alert:** Configure an alert. :ref:`alerts`
@@ -158,31 +158,31 @@ If anything is deleted in this folder it is not recoverable through OpenLP.
 Settings
 --------
 
-|plugin_list| **Manage Plugins:** 
+|plugin_list| **Manage Plugins** 
     Provides the configurable settings to control your plugin's. :ref:`plugin_list` 
 
 **Language:** 
     You can choose another UI language here or leave it on Autodetect.
 
-|button_tag| **Configure Formatting Tags:** 
+|button_tag| **Configure Formatting Tags** 
     Provides the configurable settings for formatting tags. :ref:`formatting-tags`
 
-|button_settings| **Configure Shortcuts:** 
+|button_settings| **Configure Shortcuts** 
     Provides the configurable settings for shortcuts. :ref:`shortcuts`
 
-|button_configure| **Configure OpenLP:** 
+|button_configure| **Configure OpenLP** 
     Provides the configurable settings for OpenLP. :ref:`configure`
 
 Help
 ----
 
-**Online Help:** 
+**Online Help** 
     This is a direct link to OpenLP's operating manual.
 
-**Web Site:** 
+**Web Site** 
     This is a direct link to OpenLP's web site.
 
-**About:** 
+**About** 
     Provides information, credits and license for OpenLP.
 
 
@@ -190,9 +190,9 @@ Help
 
 .. |BUTTONS_NEW| image:: pics/new_service.png
 
-.. |BUTTONS_OPEN| image:: pics/service_open.png
+.. |BUTTONS_OPEN| image:: pics/buttons_open.png
 
-.. |BUTTONS_SAVE| image:: pics/service_save.png
+.. |BUTTONS_SAVE| image:: pics/buttons_keep_results.png
 
 .. |BUTTONS_IMPORT| image:: pics/buttons_import.png
 
@@ -206,7 +206,7 @@ Help
 
 .. |PLUGIN_ALERTS| image:: pics/plugin_alerts.png
 
-.. |PLUGIN_SONGS| image:: pics/plugin_songs.png
+.. |PLUGIN_SONGS| image:: pics/search_song.png
 
 .. |PLUGIN_LIST| image:: pics/plugin_list.png
 

manual/source/plugin_list.rst

@@ -3,11 +3,9 @@
 Plugin List
 ===========
 
-OpenLP has many plugins you can activate. By default, all plugins are enabled, 
-except the Remote Access plugin. A plugin adds features and functionality to 
-OpenLP.
+OpenLP has many plugins you can activate. 
 
-To see which plugins are enabled select :menuselection:`Settings --> Plugin List`
+To see which plugins are enabled select :menuselection:`Settings --> Manage Plugins`
 or :kbd:`Alt+F7`
 
 .. image:: pics/plugin_list_main.png
@@ -18,32 +16,28 @@ Plugin Details
 The left side shows you the list of plugins. Click on a plugin to check its 
 status.
 
-**Status:** 
+**Status** 
     Shows if your plugin is Active or Inactive. Click the box to change the 
     status and click :kbd:`OK` to save your selection.
 
-**Version:** 
-    Is the version of the plugin. 
-
-**About:** 
+**About** 
     Describes the use of the plugin.
 
 For a brief description of what each plugin does, please see below.
 
-|songs| **Songs Plugin:** 
+|songs| **Songs Plugin** 
     The songs plugin provides the ability to display and manage songs.
 
-|bibles| **Bible Plugin:**
+|bibles| **Bible Plugin**
     The Bible plugin provides the ability to display Bible verses from different
     sources during the service.
 
-|presentations| **Presentation Plugin:**
+|presentations| **Presentation Plugin**
     The presentation plugin provides the ability to show presentations using a 
     number of different programs. The choice of available presentation programs
     is available to the user in a drop down box.
-    **Note:** Presentation plugin is disabled on MAC.
 
-|images| **Image Plugin:**
+|images| **Image Plugin**
     The image plugin provides displaying of images. One of the distinguishing
     features of this plugin is the ability to group a number of images together
     in the service manager, making the displaying of multiple images easier. 
@@ -53,34 +47,33 @@ For a brief description of what each plugin does, please see below.
     text-based items like songs with the selected image as a background instead 
     of the background provided by the theme. See the section on :ref:`adding_images`.
 
-|media| **Media Plugin:**
+|media| **Media Plugin**
     The media plugin provides playback of audio and video.
 
-|custom| **Custom Slide Plugin:**
+|custom| **Custom Slide Plugin**
     The custom slide plugin provides the ability to set up custom text slides
     that can be displayed on the screen the same way songs are. This plugin 
     provides greater freedom over the songs plugin.
 
-|songusage| **SongUsage Plugin:**
+|songusage| **SongUsage Plugin**
     This plugin tracks the usage of songs in services.
 
-|alerts| **Alerts Plugin:**
-    The alert plugin controls the displaying of nursery alerts on the display
+|alerts| **Alerts Plugin**
+    The alert plugin controls the displaying of alerts on the display
     screen. See :ref:`alerts` for more information
 
-|remote| **Remote Plugin:**
-    The remote plugin provides the ability to send messages to a running version
-    of OpenLP on a different computer via a web browser or through the remote API.
-    See the section on :ref:`remote_tab`.
-
+|planningcenter| **PlanningCenter Plugin**
+    The planningcenter plugin provides an interface to import service plans from the
+    Planning Center Online v2 API.
+    
 .. These are all the image templates that are used in this page.
 
 .. |ALERTS| image:: pics/plugin_alerts.png
-.. |BIBLES| image:: pics/plugin_bibles.png
+.. |BIBLES| image:: pics/search_songbook.png
 .. |CUSTOM| image:: pics/plugin_custom.png
 .. |IMAGES| image:: pics/plugin_images.png
 .. |MEDIA| image:: pics/plugin_media.png
 .. |PRESENTATIONS| image:: pics/plugin_presentations.png
-.. |REMOTE| image:: pics/plugin_remote.png
-.. |SONGS| image:: pics/plugin_songs.png
-.. |SONGUSAGE| image:: pics/plugin_songusage.png
+.. |SONGS| image:: pics/search_song.png
+.. |SONGUSAGE| image:: pics/plugin_songusage.png
+.. |PLANNINGCENTER| image:: pics/plugin_planningcenter.png

manual/source/projector.rst

@@ -300,10 +300,10 @@ PJLink defaults.
 .. |PROJECTOR_BLANK_TILED| image:: pics/projector_blank_tiled.png
 .. |PROJECTOR_CONNECT| image:: pics/projector_connect.png
 .. |PROJECTOR_CONNECT_TILED| image:: pics/projector_connect_tiled.png
-.. |PROJECTOR_DELETE| image:: pics/custom_delete.png
+.. |PROJECTOR_DELETE| image:: pics/buttons_delete.png
 .. |PROJECTOR_DISCONNECT| image:: pics/projector_disconnect.png
 .. |PROJECTOR_DISCONNECT_TILED| image:: pics/projector_disconnect_tiled.png
-.. |PROJECTOR_EDIT| image:: pics/general_edit.png
+.. |PROJECTOR_EDIT| image:: pics/buttons_edit.png
 .. |PROJECTOR_INFO| image:: pics/system_about.png
 .. |PROJECTOR_ITEM_CONNECTED_OFF| image:: pics/projector_item_connected_off.png
 .. |PROJECTOR_ITEM_CONNECTED_WARMUP_MENU| image:: pics/projector_item_connected_warmup.png
@@ -321,7 +321,7 @@ PJLink defaults.
 .. |PROJECTOR_ITEM_WARMUP| image:: pics/projector_warmup.png
 .. |PROJECTOR_MANAGER| image:: pics/projector_manager.png
 .. |PROJECTOR_MANAGER_LIST| image:: pics/projector_manager_list.png
-.. |PROJECTOR_NEW| image:: pics/projector_new.png
+.. |PROJECTOR_NEW| image:: pics/buttons_new.png
 .. |PROJECTOR_NOT_CONNECTED_ERROR| image:: pics/projector_not_connected_error.png
 .. |PROJECTOR_POWER_OFF| image:: pics/projector_power_off.png
 .. |PROJECTOR_POWER_OFF_TILED| image:: pics/projector_power_off_tiled.png

manual/source/service.rst

@@ -4,8 +4,6 @@
 Service
 =======
 
-Creating a Service
-==================
 
 Now that you have OpenLP set up the way you want, it is time to put it to use.
 
@@ -29,30 +27,30 @@ New, Open and Saving the Service
 
 Three icons at the top of the *Service Manager* will do the following:
 
-|service_new| **Create a new service:**
+|buttons_new| **Create a new service**
     This first icon will create a New Service. 
 
-|service_open| **Load an existing service:**
+|buttons_open| **Load an existing service**
     This second icon will open an already created service file. Use this icon to 
     to find the location of your file or you can open a saved service by 
     dragging and dropping it into the service manager. The service will be 
     opened and the existing service replaced. You will first be prompted to save 
     your previous service if changes were made. 
 
-|service_save| **Save this service:**
-    This icon will Save the service you created, added to, or rearranged. The 
+|buttons_save| **Save this service**
+    This icon will Save the service you created, added to or rearranged. The 
     order of service, songs, images, Bible verses, service notes, and custom 
     slides are all saved in the file.
 
 Changing the Service Level Theme
-----------------------------------------
+--------------------------------
 
 If you click on the Theme dropdown, you have the option to set the Service
 level theme. This option is covered in greater detail under
-:ref:`configtheme`.
+:ref:`theme_configure`.
 
 Note: This feature is only available if you have the Theme level set to 
-Service or Song Level in :ref:`configtheme`.
+Service or Song Level in :ref:`theme_configure`.
 
 Editing Songs in the Service
 ----------------------------
@@ -60,8 +58,8 @@ Editing Songs in the Service
 You can create your service file on a different computer than the projection 
 computer. If a song is not in the projection computer database when you open the
 saved file OpenLP will automatically import the song into the song database with 
-this option checked here :ref:`config_songs` "Add missing songs when opening 
-service."
+this option checked here :ref:`config_songs` "Import missing songs from Service 
+file".
 
 You always have the ability to edit the song in the service manager by right 
 clicking on the song and choosing :menuselection:`Edit Item` from the context 
@@ -73,18 +71,25 @@ the :ref:`creating_service` song database. Editing a song in the :ref:`library`
 will be applied to the song in your :ref:`library`.  This can be changed
 so that changes made in the :ref:`creating_service` song database update 
 the :ref:`library` song database and changes made in the :ref:`library`
-song database update the :ref:`creating_service` song database in :ref:`configure`.
+song database update the :ref:`creating_service` song database in :ref:`configure-song-related-settings`.
 
-Adding Media
-------------
+Working with Service Items
+--------------------------
 
-To add your media you can click on an item in the :ref:`library` hold and 
-drag your selection from the :ref:`library` over to the *Service Manager* 
+To add your media you can drag and drop your selection from the :ref:`library` 
+to the *Service Manager* 
 or, after clicking the media or verse you want to use, click the |add_plus|. 
-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 icons shown below to move it up or down in 
-the order you want. 
+This will add your media to the service side at the bottom. 
+
+**Note:** You always have the option to send any media live direct from the 
+:ref:`library`. Please see the :ref:`library` section for more 
+details.
+
+**Sorting Service Items**
+
+Once there are some items 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 
+icons shown below to move it up or down. 
 
 |service_top| Move item to the top of the service.
 
@@ -94,6 +99,9 @@ the order you want.
 
 |service_bottom| Move item to the end of the service.
 
+
+**Expanding and collapsing Service items**
+
 To view your Bible or song verses one by one, use the icons below. This is a 
 convenient way to move around through the verses if they are skipped or repeated. 
 Double-click on the verse you want to display live.
@@ -102,10 +110,6 @@ Double-click on the verse you want to display live.
 
 |service_collapse| Collapse all the service items.
 
-|live| Send the selected item to Live.
-
-|custom_delete| Remove the service item.
-
 As an alternative to expanding or collapsing all items in the list you can use the
 buttons to the right of a list item to expand or collapse a single list item.
 
@@ -113,65 +117,73 @@ buttons to the right of a list item to expand or collapse a single list item.
 
 |COLLAPSE_SINGLE| Collapse a single service item.
 
-**Note:** You always have the option to send any media live direct from the 
-:ref:`library`. Please see the :ref:`library` section for more 
-details.
+**Common operations on Service items**
+
+|buttons_live| Send the selected item to Live.
+
+|custom_delete| Remove the service item.
 
 Displaying an Item
 ------------------
 
-When you have all of your items needed for the service in your Service Manager
+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
-keyboard, right click the item and left click *Show Live* or click it once with
-the mouse and click on the projector |live| at the bottom of the Service Manager.
+the item, click it once with the mouse and push the :kbd:`Enter` key, right click 
+the item and left click :guilabel:`Go Live` or click it once with
+the mouse and click on the :guilabel:`Sent to Live` button |buttons_live| at the 
+bottom of the Service Manager.
 
 Any of these methods will display your item on
-the screen. When your item is displayed, it will appear in the Live windows just
-to the left of the Service Manager.
+the screen. When your item is displayed, it will be selected in the **Live pane**
+just to the left of the **Service Manager** and Live preview will be visible in the 
+bottom part of the **Live pane**. 
 
 .. image:: pics/slidecontroller.png
 
-To Preview an item in the left *Preview* panes, right click the item and left
-click *Show Preview*.
+To Preview an item in the left **Preview pane**, right click the item and left
+click :guilabel:`Show Preview`.
 
-Changing a Service Theme
-------------------------
+Changing a Service Item Theme
+-----------------------------
 
-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
-click the item and mouseover :guilabel:`Change Item Theme` and select the theme
-you want to use.
+When you get your Service items set up and you notice you don't have the correct 
+theme for it, you can right click the item and choose your preffered theme using
+:guilabel:`Change Item Theme` menu list.
 
-Moving Through a Service
-------------------------
-
-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
-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
-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
-:kbd:`Right Arrow` key the next item in your Service will be displayed.
-
-Moving Through a Song, Bible Verses or Images
----------------------------------------------
+Moving Through the Service Items
+--------------------------------
 
 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
-lyrics in the top Live window and how it actually appears on your display
-in the bottom Live window. 
+move through them. Depending on which panel is in focus you can use your keyboard 
+in various ways.
 
-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 under the top Live window.
+Using :kbd:`Enter` key in **Service manager** will :guilabel:`Send to live` 
+selected item/slide and the subsequent :kbd:`Up Arrow` or 
+:kbd:`Down Arrow` keys will change slides/items in the **Live pane**. 
+At the same time :kbd:`Left Arrow`/:kbd:`Right Arrow` will jump to previous/next 
+Service item.
+
+When the focus is in **Service manager** you can use the 
+:kbd:`Right Arrow`/:kbd:`Left Arrow` key to expand/collapse Service items. 
+:kbd:`Up Arrow` or :kbd:`Down Arrow` will not force slide change in Live.
+
+**Alternative options to changing slides**
+
+In Live pane you can also use following buttons to change slides:
 
 |slide_next| Move to next.
 
 |slide_previous| Move to previous.
 
-You can 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
-top. :kbd:`Page Up` and :kbd:`Page Down` keys will do the same thing.
+:kbd:`Page Up` and :kbd:`Page Down` keys will do the same thing.
+
+**Note:** You can also use :kbd:`Down Arrow` to go through each slide in the 
+Service item and once it reaches the last slide it switches to the next Service 
+item. See configuration options in :ref:`configure_service_item_wrapping`.
+
+
+Changing slides using keyboard shortcuts
+----------------------------------------
 
 There is shortcut support for the Live Controller in OpenLP. This allows you to 
 navigate through, and jump between, your slides in the Live Controller using only 
@@ -425,9 +437,6 @@ on the General page.
 Saving the Service
 ------------------
 
-|service_save| **Save this service:**
-    This 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
 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 
@@ -437,8 +446,8 @@ want to save your file and click :guilabel:`Ok`.
 .. These are all the image templates that are used in this page.
 
 .. |SERVICE_TIMER| image:: pics/service_timer_start.png
-.. |ADD_PLUS| image:: pics/general_add.png
-.. |LIVE| image:: pics/system_live.png
+.. |ADD_PLUS| image:: pics/buttons_add.png
+.. |BUTTONS_LIVE| image:: pics/buttons_live.png
 .. |SERVICE_TOP| image:: pics/service_top.png
 .. |SERVICE_UP| image:: pics/service_up.png
 .. |SERVICE_BOTTOM| image:: pics/service_bottom.png
@@ -448,12 +457,12 @@ want to save your file and click :guilabel:`Ok`.
 .. |SLIDE_BLANK| image:: pics/slide_blank.png
 .. |SLIDE_THEME| image:: pics/general_preview.png
 .. |SLIDE_DESKTOP| image:: pics/preferences-desktop-display.png
-.. |CUSTOM_DELETE| image:: pics/custom_delete.png
+.. |CUSTOM_DELETE| image:: pics/buttons_delete.png
 .. |SERVICE_EXPAND| image:: pics/service_expand_all.png
 .. |SERVICE_COLLAPSE| image:: pics/service_collapse_all.png
-.. |SERVICE_NEW| image:: pics/service_new.png
-.. |SERVICE_OPEN| image:: pics/service_open.png
-.. |SERVICE_SAVE| image:: pics/service_save.png
+.. |BUTTONS_NEW| image:: pics/buttons_new.png
+.. |BUTTONS_OPEN| image:: pics/buttons_open.png
+.. |BUTTONS_SAVE| image:: pics/buttons_keep_results.png
 .. |AUDIO_PAUSE| image:: pics/media_playback_pause.png
 .. |BUTTONS_ADD| image:: pics/buttons_add.png
 .. |EXPAND_SINGLE| image:: pics/service_manager_expand_one_item.png

manual/source/song_usage.rst

@@ -79,4 +79,4 @@ under :ref:`themes` using these buttons.
 
 .. |SONG_INACTIVE| image:: pics/song_usage_inactive.png
 
-.. |FILE_OPEN| image:: pics/service_open.png
+.. |FILE_OPEN| image:: pics/buttons_open.png

manual/source/songs.rst

@@ -298,8 +298,6 @@ Song Importer in OpenLP, select :guilabel:`ZionWorx (CSV)`, and locate the
 
 After clicking :guilabel:`Next` your import will be complete.
 
-.. _songs_create_edit:
-
 
 Importing from LiveWorship
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -334,6 +332,8 @@ locate the XML file you just created.
 After clicking :guilabel:`Next` your import will be complete.
 
 
+.. _songs_create_edit:
+
 Creating or Editing a Song Slide
 ================================