Merge branch 'Linked_audio' into 'master'

Document linked audio & update debug log file windows location

See merge request openlp/documentation!9

manual/source/creating_service.rst

@@ -398,6 +398,30 @@ Linked Audio Control
 by using this button. This button becomes available when you have linked an 
 audio file to a song and it is in use.
 
+.. image:: pics/play_or_pause.png
+
+To the right of the |audio_pause| button a count down timer for the audio file is
+displayed to indicate the play time remaining for the linked audio file.  If you 
+have multiple linked audio files, the play time remaining will only be for the 
+current playing linked audio file.
+
+.. image:: pics/audio_dropdown1.png
+
+By selecting the drop down menu between the |audio_pause| button and the count down
+timer you can jump to the next linked audio file for the song using :guilabel:`Next Track` or select
+the :guilabel:`Tracks` menu selection and jump to any linked audio file in the song.
+
+.. image:: pics/audio_dropdown3.png
+
+Linked audio files or groups of linked audio files can repeat when the last file
+finishes playing.  To set linked audio files to repeat, enable the :guilabel:`Repeat track list`
+in :ref:`configure` on the General page.
+
+Linked audio files can be set to start playing as soon as the first slide of the song
+is displayed.  To enable the linked audio files to start playing when the first slide 
+is displayed, disable the :guilabel:`Start background audio paused` option in :ref:`configure` 
+on the General page.
+
 Saving the Service
 ------------------
 

manual/source/songs.rst

@@ -441,6 +441,30 @@ When you are done, click :guilabel:`Save` to save your choices. You can click
 audio file is being played with a song. You can stop or start the audio playing 
 by using this button. 
 
+.. image:: pics/play_or_pause.png
+
+To the right of the |audio_pause| button a count down timer for the audio file is
+displayed to indicate the play time remaining for the linked audio file.  If you 
+have multiple linked audio files, the play time remaining will only be for the 
+current playing linked audio file.
+
+.. image:: pics/audio_dropdown1.png
+
+By selecting the drop down menu between the |audio_pause| button and the count down
+timer you can jump to the next linked audio file for the song using :guilabel:`Next Track` or select
+the :guilabel:`Tracks` menu selection and jump to any linked audio file in the song.
+
+.. image:: pics/audio_dropdown3.png
+
+Linked audio files or groups of linked audio files can repeat when the last file
+finishes playing.  To set linked audio files to repeat, enable the :guilabel:`Repeat track list`
+in :ref:`configure` on the General page.
+
+Linked audio files can be set to start playing as soon as the first slide of the song
+is displayed.  To enable the linked audio files to start playing when the first slide 
+is displayed, disable the :guilabel:`Start background audio paused` option in :ref:`configure` 
+on the General page.
+
 .. These are all the image templates that are used in this page.
 
 .. |MOVE_UP| image:: pics/service_up.png

manual/source/troubleshooting.rst

@@ -81,16 +81,17 @@ Windows
 ^^^^^^^
 
 Find the OpenLP 2.4 folder in your Start menu. Choose the "OpenLP (Debug)" option.
+OpenLP will start up in Debug mode and save the log file.
 
-OpenLP will start up. Go to the :menuselection:`Tools --> Open Data Folder` menu 
+To get to the log file folder on Windows, press the Windows Key and "R" at the same time. This will open the
-option, and an Explorer window will appear containing folders such as alerts, 
+:menuselection:`Run dialog`. Type ``%appdata%\OpenLP`` and press <Enter>. This will open a file Explorer window within the
-bibles, custom etc. Keep this Explorer window open.
+OpenLP folder.  Keep this Explorer window open.
 
 Now repeat the steps you need to take in OpenLP to reproduce the problem you had, 
 and then close down OpenLP. 
 
-In the Explorer window you left open, navigate up one level into the openlp 
+In the Explorer window you left open, you will see the ``openlp.log`` file. This 
-folder. You will see the ``openlp.log`` file. This is the file to e-mail.
+is the file to e-mail.
 
 Linux/FreeBSD
 ^^^^^^^^^^^^^