diff --git a/manual/source/bibles.rst b/manual/source/bibles.rst index a8b3037..cab3e32 100644 --- a/manual/source/bibles.rst +++ b/manual/source/bibles.rst @@ -20,7 +20,7 @@ You may also enter the Bible Importer by clicking the :guilabel:`Import Icon:` |importicon| Import Bibles Click on the :guilabel:`Import Bibles` icon to start the Bible import wizard. -.. |IMPORTICON| image:: pics/themeimportexport.png +.. |IMPORTICON| image:: pics/theme_import.png You will see the Bible Importer window, click :guilabel:`Next`. @@ -41,9 +41,12 @@ copyright notice. Click :guilabel:`Next` to continue. .. image:: pics/bibleimportdetails1.png -After filling in the copyright details, OpenLP will start to import your Bible. +After entering the copyright details, OpenLP will start to import your Bible. It may take some time to import your Bible so please be patient. +**Note:** You can use one blank space using the space bar in the copyright field +to continue without entering anything. + .. image:: pics/bibleimportfinished1.png When the import has finished click :guilabel:`Finish` and you should be diff --git a/manual/source/custom_slides.rst b/manual/source/custom_slides.rst index fd016ce..d317df4 100644 --- a/manual/source/custom_slides.rst +++ b/manual/source/custom_slides.rst @@ -7,20 +7,18 @@ Adding a new custom slide displays the following dialog: .. image:: pics/mediamanager_custom_edit.png -**Title** - Name of your custom slide. +**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. +**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. +**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. +**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 diff --git a/manual/source/display_tags.rst b/manual/source/display_tags.rst index 2ab5b07..42cdd34 100644 --- a/manual/source/display_tags.rst +++ b/manual/source/display_tags.rst @@ -5,11 +5,11 @@ Formatting Tags =============== OpenLP has the ability to add additional formatting to text in songs and custom -slides through the use of :ref:`g-formatting-tags`. :ref:`g-formatting-tags` provide -a shortcut to use HTML and CSS to format text. +slides through the use of :ref:`g-formatting-tags`. :ref:`g-formatting-tags` +provide a shortcut to use HTML and CSS to format text. -:ref:`g-formatting-tags` consist of two parts, a starting and an ending tag, each -tag consists of brace, tag identifier, brace. +:ref:`g-formatting-tags` consist of two parts, a starting and an ending tag, +each tag consisting of a brace, tag identifier, brace. **Note:** HTML or CSS cannnot be directly entered into OpenLP. They must be defined through the use of :ref:`g-formatting-tags` @@ -21,7 +21,7 @@ Using a Formatting Tag is being edited or by using the mouse to select and insert the tags. :ref:`g-formatting-tags` can not span across page breaks. If a tag begins with text on one side of a page break it cannot stretch across the break. Instead, -two sets of tags will need to be used on each side of the break. +two sets of tags will need to be used one set on each side of the break. Adding Formatting Tags Using Text --------------------------------- @@ -52,13 +52,13 @@ followed by selecting the desired formatting. Example of Use ^^^^^^^^^^^^^^ -Select the song or custom slide to edit. Next, highlight the text thaI think t needs +Select the song or custom slide to edit. Next, highlight the text that you want to be formatted. .. image:: /pics/select_text.png Right click on the selected text and select :menuselection:`Formatting Tags` -followed by selecting the appropriate formatting for the selected text. +followed by selecting the desired formatting for the selected text. .. image:: /pics/select_formatting.png @@ -89,20 +89,20 @@ The following tags are included with OpenLP Configuring Formatting Tags =========================== -To add new :ref:`g-formatting-tags` go to :menuselection:`Settings -> Configure +To add new :ref:`g-formatting-tags` go to :menuselection:`Settings --> Configure Formatting Tags` .. image:: pics/configure_formatting_tags.png Click the :guilabel:`New` button to add new :ref:`g-formatting-tags`. Enter the description of the :ref:`g-formatting-tags` followed by the tag. The tag must be -unique. Tags do not need to put the in braces {} here, only when using the tag. +unique. You do not need to put the in braces {} here, only when using the tag. Finally, enter in the HTML or CSS for the tag and click :guilabel:`Save` to complete adding new :ref:`g-formatting-tags`. To delete :ref:`g-formatting-tags` that you have entered click on the :ref:`g-formatting-tags` from the list and click :guilabel:`Delete`. -**Note** if a tag is deleted that is in use in a song or custom slide the slide +**Note:** if a tag is deleted that is in use in a song or custom slide the slide will display the tags {} without any formatting. The deleted tags will need to be manually deleted from the songs or custom slides. diff --git a/manual/source/pics/songselectlyrics.png b/manual/source/pics/songselectlyrics.png index 2e3d92f..7de8b8e 100644 Binary files a/manual/source/pics/songselectlyrics.png and b/manual/source/pics/songselectlyrics.png differ diff --git a/manual/source/pics/songselectsongsearch.png b/manual/source/pics/songselectsongsearch.png index de0ea12..8813383 100644 Binary files a/manual/source/pics/songselectsongsearch.png and b/manual/source/pics/songselectsongsearch.png differ diff --git a/manual/source/plugin_list.rst b/manual/source/plugin_list.rst index 3a0a7cf..d6d4f43 100644 --- a/manual/source/plugin_list.rst +++ b/manual/source/plugin_list.rst @@ -38,7 +38,7 @@ For a brief description of what each plugin does, please see below. 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. + **Note:** Presentation plugin is disabled on MAC. |images| **Image Plugin** The image plugin provides displaying of images. One of the distinguishing diff --git a/manual/source/songs.rst b/manual/source/songs.rst index f26b952..c47bc23 100644 --- a/manual/source/songs.rst +++ b/manual/source/songs.rst @@ -75,8 +75,8 @@ Importing from CCLI Song Select ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ To import from CCLI Song Select you must be a CCLI Subscriber and also a -subscriber of the Song Select service. For more info check out the `CCLI website. -`_ +subscriber of the Song Select service. For more information check out the +`CCLI website. `_ The first step for importing from CCLI Song Select is to log into your account. Then search for your desired song. For this example we will be adding the song @@ -112,10 +112,10 @@ assign a Theme, or edit Copyright Info & Comments, you will do this through the `Song Editor`. **Edit:** To edit an existing song you can either click on a song in the -`Media Manager` and then click the button to :guilabel:`Edit the selected song` -or right click a song from either the `Media Manager` or additionally from the -`Service Manager` and click :guilabel:`Edit item`. If you are adding a new song -click :guilabel:`Add a new Song` in the `Media Manager`. +:ref:`media-manager` and then click the button to :guilabel:`Edit the selected song` +or right click a song from either the :ref:`media-manager` or additionally from +the :ref:`creating_service` and click :guilabel:`Edit item`. If you are adding a +new song click :guilabel:`Add a new Song` in the :ref:`media-manager`. .. image:: pics/song_edit_lyrics.png @@ -175,14 +175,15 @@ and the format tags will be entered with your lyrics. These tags are not visible when displayed. To remove the format, delete the tag on each end of the word or sentence. -**Edit:** To edit an existing verse, click on the verse you wish to *Edit* then click on -:guilabel:`Edit`, make your changes and click :guilabel:`Save`. +**Edit:** To edit an existing verse, click on the verse you wish to *Edit* then +click on :guilabel:`Edit`, make your changes and click :guilabel:`Save`. **Edit All:** To edit the whole song at once, click on :guilabel:`Edit All`. **Delete:** To delete a verse, click on the verse you want to delete and it will highlight, click on the :guilabel:`Delete` button and it will be deleted. -**Warning:**, once you click the :guilabel:`Delete` button, you will not be + +**Warning:** Once you click the :guilabel:`Delete` button, you will not be asked again, it will be deleted immediately. .. image:: pics/song_edit_verse_type.png @@ -206,8 +207,8 @@ have an author entered. You can add a blank space for the author name. **Authors:** Click the drop down arrow to view all authors or start typing a name in the box and a list will appear. If the authors name has not been added, type the authors name in the box and click :guilabel:`Add to Song`. The authors name -will appear below and will also be added to your database. If you accidentally add -the wrong author you can click on the authors name and click :guilabel:`Remove`. +will appear below and will also be added to your database. If you accidentally +add the wrong author you can click on the authors name and click :guilabel:`Remove`. :guilabel:`Manage Authors, Topics, Song Books`: Clicking this button will bring up your complete list of authors. @@ -244,8 +245,10 @@ new theme by clicking the :guilabel:`New Theme` button. you would like to use the © symbol click :guilabel:`©` button. This information is displayed in the footer. -**CCLI number:** Enter the CCLI number in this box. Note: this is the CCLI number -of the song, not your contract number. This number is not displayed in the footer +**CCLI number:** Enter the CCLI number in this box. + +**Note:** this is the CCLI number of the song, not your contract number. This +number is not displayed in the footer. **Comments:** You can add comments in this box. This information is not displayed in the footer. diff --git a/manual/source/themes.rst b/manual/source/themes.rst index cff49e3..ca09193 100644 --- a/manual/source/themes.rst +++ b/manual/source/themes.rst @@ -28,8 +28,9 @@ own. .. image:: /pics/theme_manager_selectcolor.png -**Gradient:** Choose the two colors, First and Second, you want to fade together -and the Gradient drop down will let you determine the directions of the fade. +**Gradient:** Choose the two colors, *Starting* and *Ending* that you want to +fade together and the Gradient drop down will let you determine the directions +of the fade. .. image:: /pics/theme_manager_gradient.png @@ -122,7 +123,7 @@ display in a different position on the screen. .. image:: /pics/theme_manager_outputlocation.png -You can also change the Width and the Height of the Main Area of the Footer Area. +You can also change the Width and the Height of the Main Area and the Footer Area. When you are finished setting your Output Area Locations, click :guilabel:`Next`.