changed display tags to formatting tags

bzr-revno: 46

manual/source/display_tags.rst

@@ -1,25 +1,37 @@
-.. _display-tags:
+.. _formatting-tags:
 
-============
+===============
-Display Tags
+Formatting Tags
-============
+===============
 
 OpenLP has the ability to add additional formatting to text in songs and custom
-slides through the use of :ref:`g-display-tags`. :ref:`g-display-tags` provide 
+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-display-tags` consist of two parts, a starting and an ending tag, each
+:ref:`g-formatting-tags` consist of two parts, a starting and an ending tag, each
 tag consists of brace, tag identifier, brace. 
 
-Using a Display Tag
+**Note:** HTML or CSS cannnot be directly entered into OpenLP. They must be
--------------------
+defined through the use of :ref:`g-formatting-tags`
 
-To use :ref:`g-display-tags` surround the text with a starting tag {} followed
+Using a Formatting Tag
+======================
+
+:ref:`g-formatting-tags` can be inserted by typing the tag into the text that 
+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.
+
+Adding Formatting Tags Using Text
+---------------------------------
+
+To use :ref:`g-formatting-tags` surround the text with a starting tag {} followed
 by the text to be formatted. End the text to be formatted with an ending tag
 {/}.
 
 Example of Use
---------------
+^^^^^^^^^^^^^^
 
 To make a section of text bold you would do the following in a custom slide or
 song::
@@ -30,8 +42,33 @@ This will yield the text as:
 
   Amazing grace how **sweet** the sound.
   
-Included Display Tags
+Adding a Formatting Tag Using The Mouse
----------------------
+---------------------------------------
+
+:ref:`g-formatting-tags` can be inserted by selecting the text you wish to
+format. Right click on the text and select :menuselection:`Formatting Tags` 
+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
+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.
+
+.. image:: /pics/select_formatting.png
+
+The formatting tags should now be inserted.
+
+.. image:: /pics/tags_inserted.png
+
+
+Included formatting tags
+------------------------
 
 The following tags are included with OpenLP
 
@@ -49,22 +86,22 @@ The following tags are included with OpenLP
 * **{st}** bold
 * **{it}** italics
 
-Configuring Display Tags
+Configuring formatting tags
-------------------------
+---------------------------
 
-To add new :ref:`g-display-tags` go to :menuselection:`Settings -> Configure 
+To add new :ref:`g-formatting-tags` go to :menuselection:`Settings -> Configure 
-Display Tags`
+Formatting Tags`
 
-.. image:: pics/configure_display_tags.png
+.. image:: pics/configure_formatting_tags.png
 
-Click the :guilabel:`New` button to add new :ref:`g-display-tags`. Enter the 
+Click the :guilabel:`New` button to add new :ref:`g-formatting-tags`. Enter the 
-description of the display tag followed by the tag. The tag must be unique.
+description of the :ref:`g-formatting-tags` followed by the tag. The tag must be
-Tags do not need to put the in braces {} here, only when using the tag.
+unique. Tags 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-display-tags`.
+complete adding new :ref:`g-formatting-tags`.
 
-To delete :ref:`g-display-tags` that you have entered click on the display tag
+To delete :ref:`g-formatting-tags` that you have entered click on the
-from the list and click :guilabel:`Delete`.
+: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
 will display the tags {} without any formatting.  The deleted tags will need to

manual/source/glossary.rst

@@ -8,22 +8,14 @@ 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-display-tags:
+.. _g-formatting-tags:
 
-Display Tags
+Formatting Tags
-------------
+---------------
 
-:ref:`display-tags` give you the ability to add additional text formatting to text in
+:ref:`formatting-tags` give you the ability to add additional text formatting to text in
 songs and custom slides.
 
-.. _g-wizard:
-
-First Time Wizard
------------------
-
-The :ref:`wizard` gives you the ability to perform a basic setup before OpenLP
-starts for the first time.
-
 .. _g-main-window:
 
 Main Window