openlp-core team mailing list archive

[Wesley Stout <wesleystout@xxxxxxxxx>]

Wesley Stout has proposed merging lp:~wesleystout/openlp/newdocformat into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~wesleystout/openlp/newdocformat/+merge/59111

After discussion with Raoul on the documentation we are trying to get things a little more as desired by the developers. This is far from complete, but the hope is to have a "quick start guide" to show the basic operation, then have the full on reference type manual that we have to refer people in order to do some more advanced things. Added the installation.rst with install directions for Windows and OS X is the only content change. Will add a detailed Linux section there I'm gathering info for that. Also hopefully for the BSDs also.
-- 
https://code.launchpad.net/~wesleystout/openlp/newdocformat/+merge/59111
Your team OpenLP Core is requested to review the proposed merge of lp:~wesleystout/openlp/newdocformat into lp:openlp.

=== modified file 'documentation/manual/source/bibles.rst'
--- documentation/manual/source/bibles.rst	2011-04-15 21:18:49 +0000
+++ documentation/manual/source/bibles.rst	2011-04-26 18:12:33 +0000
@@ -21,35 +21,20 @@
 
 .. image:: pics/bibleimport01.png
 
-After clicking :guilabel:`Next` you can select from the various types of
-software that OpenLP will convert Bibles from. Click on the file folder icon to
-choose the file(s) of the Bible database you want to import. See the sections
-below for more information on the different formats that OpenLP will import.
-Click :guilabel:`Next` to continue.
+After clicking :guilabel:`Next` you can select from the various types of 
+software that OpenLP will convert Bibles from.
 
 .. image:: pics/bibleimport02.png
 
-After selecting your file(s), you'll be asked to fill in the details of the
-Bible you are importing. Remember to check what information you need to display
-for your Bible's translation, as some of them have strict rules around the
-copyright notice. Click :guilabel:`Next` to continue.
-
-.. image:: pics/bibleimportdetails1.png
-
-After filling in the copyright details, OpenLP will start to import your Bible.
-It may take some time to import your Bible so please be patient.
-
-.. image:: pics/bibleimportfinished1.png
-
-When the import has finished click :guilabel:`Finish` and you should be 
-ready to use your Bible in OpenLP.
-
-Importing from openlp.org 1.x
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Importing Bibles from openlp.org 1.x is a simple process. First you will need to 
-locate your version 1.x Bibles. Version 1.x Bibles have the `.bible` file
-extension.
+Click on the file folder icon to choose the file of the Bible database you
+want to import. See the following sections for information on the different 
+formats that OpenLP will import.
+
+Importing from OpenLP Version 1
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Converting from OpenLP Version 1 is a simple process. First you will need to 
+locate your Version 1 Bibles.
 
 Windows XP::
 
@@ -59,15 +44,22 @@
 
     C:\ProgramData\openlp.org\Data\Bibles\
 
-After selecting all of the openlp.org 1.x Bibles you want to convert, click
-:guilabel:`Next` to continue the import process.
+OpenLP Version 1 Bibles have the `.bible` file extension. After selecting
+all of the OpenLP Version 1 Bibles you want to convert, click :guilabel:`Next` 
+
+.. image:: pics/bibleimportdetails1.png
+
+Enter your Bible name and copyright details. Click :guilabel:`Next`. It may
+take some time to convert your Bibles so please be patient.
+
+.. image:: pics/bibleimportfinished1.png
+
+When the import has finished click :guilabel:`Finish` and you should be 
+ready to use your OpenLP Version 1 Bibles.
 
 Importing OSIS Bibles
 ^^^^^^^^^^^^^^^^^^^^^
 
-Importing OSIS files is very simple. Select OSIS as your import source, select
-your OSIS Bible file and continue the import process.
-
 **About OSIS Formatted Bibles**
 
 The OSIS XML standard was designed to provide a common format for distribution
@@ -77,11 +69,24 @@
 If you have any software installed that is part of the `Sword Project 
 <http://www.crosswire.org/sword/index.jsp>`_ it can be easily converted.
 
+Importing OSIS files is very simple. Select your OSIS Bible file and click
+:guilabel:`Next`
+
+.. image:: pics/bibleimportdetails1.png
+
+Enter you Bible name and copyright details. Click :guilabel:`Next`. It may take
+some time to convert your Bibles so please be patient.
+
+.. image:: pics/bibleimportfinished1.png
+
+Click :guilabel:`Finish` and you should be ready to use your OpenLP Version
+1 Bibles.
+
 You can use the commands below convert Bibles from that software to OSIS format. 
 
 The following commands are used in all platforms and the commands are case 
-sensitive across all platforms. To convert a Bible using the command prompt in 
-Windows or a terminal in Linux or Mac OS X you would type::
+sensitive across all platforms. To convert a Bible using Command Prompt in 
+Windows or a Terminal in Linux or MAC you would type::
 
     mod2osis biblename > biblename.osis
 
@@ -109,9 +114,17 @@
 except you will need to extract the bible from a zip file. This is usually done
 by right clicking on the downloaded file and select `Extract` or `Extract Here`.
 
-After selecting the OpenSong Bibles you want to import, follow the rest of the
-import process. When the import has finished you should be ready to use your
-OpenSong Bibles.
+After selecting the OpenSong Bibles you want to convert, click :guilabel:`Next` 
+
+.. image:: pics/bibleimportdetails1.png
+
+Enter your Bible name and copyright details. Click :guilabel:`Next`. It may
+take some time to convert your Bibles so please be patient.
+
+.. image:: pics/bibleimportfinished1.png
+
+When the import has finished then click :guilabel:`Finish` and you should now be 
+ready to use your OpenSong Bibles.
 
 Importing Web Download Bibles
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -126,6 +139,8 @@
 
 To use the web download feature select web download from the import wizard.
 
+.. image:: pics/bibleimport01.png
+
 You can select from several options of location to download from and also
 what Bible translation you need. You will probably want to choose the location 
 from where you get the best performance or has the translation you need.
@@ -139,20 +154,30 @@
 .. image:: pics/webbibleproxy1.png
 
 After selecting your download location and the Bible you wish to use, click
-:guilabel:`Next` to continue the import process. When your import is completed
-you should now be ready to use the web bible.
+:guilabel:`Next` When your import is completed click :guilabel:`Finish`
+
+.. image:: pics/biblewebcomplete.png
+
+You should now be ready to use the web bible.
 
 Importing CSV formatted Bibles
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 If you have a Bible in .csv format OpenLP can import it. CSV Bibles will
-consist of two files a `books` file and a `verse` file. Select CSV from the list
-of Bible types to import.
+consist of two files a `books` file and a `verse` file.
+
+Select CSV from the list of Bible types to import.
+
+.. image:: pics/bibleimport02.png
 
 You are now ready to select your .csv files. You will need to select both your 
 books and verse file location.
 
 .. image:: pics/csvimport1.png
 
-After you have selected the file locations you can continue with the import
-process. Once it is complete you should be ready to use your imported CSV Bible.
+After you have selected the file locations you can click :guilabel:`Next`
+
+.. image:: pics/bibleimportfinished1.png
+
+Click :guilabel:`Finish` and you should now be ready to use your imported CSV
+Bible
\ No newline at end of file

=== modified file 'documentation/manual/source/configure.rst'
--- documentation/manual/source/configure.rst	2011-04-05 18:35:27 +0000
+++ documentation/manual/source/configure.rst	2011-04-26 18:12:33 +0000
@@ -43,14 +43,9 @@
 
 **Show the splash screen:**
 
-The OpenLP logo is displayed while OpenLP loads when this checkbox is checked.
-This is useful to give some indication that the program is loading.
-
-**Check for updates to OpenLP**
-
-OpenLP will check to see if there is a newer version available on a regular 
-basis when this checkbox is checked. Please note that this requires Internet 
-access.
+When this box it selected, the OpenLP logo will be displayed in the center of 
+the screen until the program opens. This is useful to know if the program is 
+opening.
 
 Application Settings
 ^^^^^^^^^^^^^^^^^^^^
@@ -65,14 +60,6 @@
 When this box is selected, the next item in the Service Manager will show in the
 Preview pane.
 
-**Unblank display when adding new live item**
-
-When using the :guilabel:`blank to` button with this checkbox checked, on going 
-live with the next item, the screen will be automatically re-enabled. If this 
-checkbox is not checked you will need to click the :guilabel:`blank to` button 
-again to reverse the action.
-
-
 **Slide loop delay** 
 
 This setting is the time delay in seconds if you want to continuously loop

=== modified file 'documentation/manual/source/faq.rst'
--- documentation/manual/source/faq.rst	2011-04-07 19:36:50 +0000
+++ documentation/manual/source/faq.rst	2011-04-26 18:12:33 +0000
@@ -5,6 +5,35 @@
 General Questions
 =================
 
+What is OpenLP?
+---------------
+
+OpenLP stands for "Open Source Lyrics Projection" and is presentation software
+developed for churches to provide a single easy to use interface for the
+projection needs of a typical worship service. First created in 2004, it has
+steadily grown in features and maturity such that it is now a mainstay in
+hundreds of churches around the world.
+
+OpenLP has searchable databases of songs and Bible verses allowing them to be
+projected instantly or saved in a pre-prepared order of service file. Themes
+allow for a variety of presentation options and allow you to add attractive
+visuals to enhance your presentations. PowerPoint and OpenOffice presentations,
+videos and audio files can be run from within the program removing the need to
+switch between different programs. Alert messages can be displayed so the
+nursery or car park stewards can notify the congregation easily. Remote
+capability allows the worship leader to change songs, or for alert messages to
+be sent from anywhere on the network, even via a smart phone or tablet.
+
+Being free, this software can be installed on as many computers as required, 
+including the home computers of worship leader(s) at no additional cost. 
+Compared to the expensive site licenses and restrictions of commercial software
+we believe OpenLP is the perfect choice for quality and value. Still in active
+development by a growing team of enthusiastic developers, features are being
+added all the time resulting in continual improvement of the software.
+
+OpenLP is licensed under the GNU Generic Public License, which means
+that it is free to use, distribute, modify, and it stays free.
+
 When is the release date for OpenLP 2.0?
 ----------------------------------------
 
@@ -569,4 +598,4 @@
 page. If it is, then you need to say no more, it's already been suggested! If it 
 isn't on the list, then head to the 
 `feature request forum <http://openlp.org/en/forums/openlp_20/feature_requests.html>`_ 
-and post the idea there.
+and post the idea there.
\ No newline at end of file

=== modified file 'documentation/manual/source/index.rst'
--- documentation/manual/source/index.rst	2011-04-03 13:35:58 +0000
+++ documentation/manual/source/index.rst	2011-04-26 18:12:33 +0000
@@ -6,20 +6,36 @@
 Welcome to the OpenLP 2.0 User Manual
 =====================================
 
-Contents:
+Getting Started With OpenLP
+---------------------------
 
 .. toctree::
    :maxdepth: 2
 
    introduction
+  
+Reference Manual
+----------------
+
+.. toctree::
+   :maxdepth: 2
+
+   alert
+   bibles
+   configure
+   dualmonitors
+   wizard
    glossary
-   wizard
-   dualmonitors
-   configure
-   bibles
-   themes
+   installation
    mediamanager
    songs
-   alert
+   themes
+
+Questions and Troubleshooting
+-----------------------------
+
+.. toctree::
+   :maxdepth: 2
+
    faq
    troubleshooting

=== added file 'documentation/manual/source/installation.rst'
--- documentation/manual/source/installation.rst	1970-01-01 00:00:00 +0000
+++ documentation/manual/source/installation.rst	2011-04-26 18:12:33 +0000
@@ -0,0 +1,77 @@
+Installing OpenLP
+=================
+
+Microsoft Windows
+-----------------
+
+Installing OpenLP is identical over all supported versions of Windows. After
+downloading the file from the `download page <http://www.openlp.org/en/download.html>`_ 
+open the file by double clicking when the download is complete. After opening 
+the downloaded file agree to open the unverified file if you are prompted.
+
+Next select your language and click :guilabel:`OK`
+
+.. image:: pics/selectlanguage.png
+
+After reading the welcome message click :guilabel:`Next` to continue the
+installation.
+
+.. image:: pics/welcome.png
+
+Agree to the license agreement. Click :guilabel:`Next` to continue.
+
+.. image:: pics/license.png
+
+Select the install location for OpenLP. Choosing the default location is
+generally the best choice. Click :guilabel:`Next` to continue.
+
+.. image:: pics/installlocation.png
+
+Select a start menu folder for OpenLP to be visible in. The default location
+here is generally the best choice. Click :guilabel:`Next` to continue.
+
+.. image:: pics/startmenufolder.png
+
+Select if you want to create a desktop or Quick Launch icon. Click :guilabel:`Next`
+to continue.
+
+.. image:: pics/additionaltask.png
+
+Review your previous choices. If you need to make any changes click the
+:guilabel:`Back button` to get to the previous choices, or click :guilabel:`Install`
+
+.. image:: pics/readytoinstall.png
+
+The progress bar will update you on how far along the installation has gone.
+
+.. image:: pics/progress.png
+
+When the install is complete you will have the option to launch OpenLP. After
+making your selection click :guilabel:`Finish`
+
+Mac OS X
+--------
+
+Installing OpenLP on OS X is very simple. After downloading the correct file
+from the OpenLP `download page <http://www.openlp.org/en/download.html>`_ 
+double click on the .dmg file. Drag the OpenLP icon over to the Applications
+folder and you will be ready to use OpenLP. OpenLP will be available in your
+Applications folder.
+
+.. image:: pics/osxinstall.png
+
+Linux
+-----
+
+Installation process on Linux distributions vary by distribution. See the OpenLP `download page <http://www.openlp.org/en/download.html>`_ for distribution specific instructions.
+
+
+
+
+
+
+
+
+
+
+

=== modified file 'documentation/manual/source/mediamanager.rst'
--- documentation/manual/source/mediamanager.rst	2011-04-03 00:14:38 +0000
+++ documentation/manual/source/mediamanager.rst	2011-04-26 18:12:33 +0000
@@ -99,10 +99,9 @@
 Book Chapter 
 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: Verse-Chapter:Verse
 
 `Text Search:`
 

=== added file 'documentation/manual/source/pics/additionaltask.png'
Binary files documentation/manual/source/pics/additionaltask.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/additionaltask.png	2011-04-26 18:12:33 +0000 differ
=== modified file 'documentation/manual/source/pics/configureadvanced.png'
Binary files documentation/manual/source/pics/configureadvanced.png	2011-04-25 08:38:29 +0000 and documentation/manual/source/pics/configureadvanced.png	2011-04-26 18:12:33 +0000 differ
=== modified file 'documentation/manual/source/pics/configurealerts.png'
Binary files documentation/manual/source/pics/configurealerts.png	2011-04-25 08:38:29 +0000 and documentation/manual/source/pics/configurealerts.png	2011-04-26 18:12:33 +0000 differ
=== modified file 'documentation/manual/source/pics/configurebibles.png'
Binary files documentation/manual/source/pics/configurebibles.png	2011-04-25 08:38:29 +0000 and documentation/manual/source/pics/configurebibles.png	2011-04-26 18:12:33 +0000 differ
=== modified file 'documentation/manual/source/pics/configurecustom.png'
Binary files documentation/manual/source/pics/configurecustom.png	2011-04-25 08:38:29 +0000 and documentation/manual/source/pics/configurecustom.png	2011-04-26 18:12:33 +0000 differ
=== modified file 'documentation/manual/source/pics/configuregeneral.png'
Binary files documentation/manual/source/pics/configuregeneral.png	2011-04-25 08:38:29 +0000 and documentation/manual/source/pics/configuregeneral.png	2011-04-26 18:12:33 +0000 differ
=== modified file 'documentation/manual/source/pics/configuremedia.png'
Binary files documentation/manual/source/pics/configuremedia.png	2011-04-25 08:38:29 +0000 and documentation/manual/source/pics/configuremedia.png	2011-04-26 18:12:33 +0000 differ
=== modified file 'documentation/manual/source/pics/configurepresentations.png'
Binary files documentation/manual/source/pics/configurepresentations.png	2011-04-25 08:38:29 +0000 and documentation/manual/source/pics/configurepresentations.png	2011-04-26 18:12:33 +0000 differ
=== modified file 'documentation/manual/source/pics/configureremotes.png'
Binary files documentation/manual/source/pics/configureremotes.png	2011-04-25 08:38:29 +0000 and documentation/manual/source/pics/configureremotes.png	2011-04-26 18:12:33 +0000 differ
=== modified file 'documentation/manual/source/pics/configuresongs.png'
Binary files documentation/manual/source/pics/configuresongs.png	2011-04-25 08:38:29 +0000 and documentation/manual/source/pics/configuresongs.png	2011-04-26 18:12:33 +0000 differ
=== modified file 'documentation/manual/source/pics/configurethemes.png'
Binary files documentation/manual/source/pics/configurethemes.png	2011-04-25 08:38:29 +0000 and documentation/manual/source/pics/configurethemes.png	2011-04-26 18:12:33 +0000 differ
=== added file 'documentation/manual/source/pics/installcomplete.png'
Binary files documentation/manual/source/pics/installcomplete.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/installcomplete.png	2011-04-26 18:12:33 +0000 differ
=== added file 'documentation/manual/source/pics/installlocation.png'
Binary files documentation/manual/source/pics/installlocation.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/installlocation.png	2011-04-26 18:12:33 +0000 differ
=== added file 'documentation/manual/source/pics/license.png'
Binary files documentation/manual/source/pics/license.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/license.png	2011-04-26 18:12:33 +0000 differ
=== added file 'documentation/manual/source/pics/osxinstall.png'
Binary files documentation/manual/source/pics/osxinstall.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/osxinstall.png	2011-04-26 18:12:33 +0000 differ
=== added file 'documentation/manual/source/pics/progress.png'
Binary files documentation/manual/source/pics/progress.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/progress.png	2011-04-26 18:12:33 +0000 differ
=== added file 'documentation/manual/source/pics/readytoinstall.png'
Binary files documentation/manual/source/pics/readytoinstall.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/readytoinstall.png	2011-04-26 18:12:33 +0000 differ
=== added file 'documentation/manual/source/pics/selectlanguage.png'
Binary files documentation/manual/source/pics/selectlanguage.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/selectlanguage.png	2011-04-26 18:12:33 +0000 differ
=== added file 'documentation/manual/source/pics/startmenufolder.png'
Binary files documentation/manual/source/pics/startmenufolder.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/startmenufolder.png	2011-04-26 18:12:33 +0000 differ
=== added file 'documentation/manual/source/pics/welcome.png'
Binary files documentation/manual/source/pics/welcome.png	1970-01-01 00:00:00 +0000 and documentation/manual/source/pics/welcome.png	2011-04-26 18:12:33 +0000 differ
=== modified file 'documentation/manual/source/songs.rst'
--- documentation/manual/source/songs.rst	2011-04-16 08:32:30 +0000
+++ documentation/manual/source/songs.rst	2011-04-26 18:12:33 +0000
@@ -99,134 +99,4 @@
 Press :guilabel:`Finish` and OpenLP will be ready to use your songs imported
 from CCLI SongSelect.
 
-Creating or editing a song slide
-================================
-
-If you want to create a new song slide or, once you have a song imported, you 
-want to edit and rearrange the Title & Lyrics, Author, Topics & Song Book, 
-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`.
-
-.. image:: pics/song_edit_lyrics.png
-
-**Title:** This is where you would name your song or edit a song name.
-
-**Alternate title:**Alternate Title was for songs with two names 
-"Lord the Light" - "Shine Jesus Shine". You can also add a name in this box that 
-will bring up the song in Titles search. **Example:** You could use an alternate 
-title of "hymn" on all your hymn song titles for grouping. When you search "hymn" 
-it will show all the hymns that have "hymn" for the Alternate title. 
-
-**Lyrics:** The *Lyrics* window shows all lyrics imported or added. On the left 
-side of the lyrics you will see a capital letter followed by a number. A V1 
-would represent verse 1, C1 would be Chorus 1. You will use these letters and
-numbers for the order to display the lyrics.
-
-**Verse Order:** After you entered or edited your song, you will want OpenLP to 
-display the verses in the correct order you want them displayed. On the left side 
-of your lyrics you will see C1, V1, V2 etc. the way they were imported or added. 
-To put your lyrics in the correct order is as simple as typing in the 
-:guilabel:`Verse order box` at the bottom, the correct order you want them 
-displayed, with only a blank space in between each entry. The correct format will 
-look like this: V1 C1 V2 C1 V3 C1. If you forget to put a space in between the 
-order, or if you do not have the corresponding verse number, OpenLP will politely 
-tell you with a pop-up error message what is wrong so you can correct your 
-mistake and save it. Verse order is optional and if left blank the verses will 
-display in the order seen in *Lyrics*.
-
-.. image:: pics/song_edit_verse_error.png
-
-Adding or editing the lyrics
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-**Add:** To Add a new verse, click on :guilabel:`Add`. The main window is where
-you will type your lyrics. OpenLP is packaged with a spell checker for most 
-languages. If you misspell a word it will be underlined. Right click the 
-underlined word and left click *Spelling Suggestions* or you can ignore it and
-continue typing. You also have the ability to format the font using *Formatting
-Tags*. Highlight the word/words you want to format and right click the highlight. 
-Left click *Formatting Tags* and choose the format you want to apply to the font 
-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 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
-asked again, it will be deleted immediately.
-
-.. image:: pics/song_edit_verse_type.png
-
-**Verse type:** gives you 7 ways to classify your lyrics. Verse, Chorus, Bridge, 
-Pre-Chorus, Intro, Ending, Other. 
-
-If you have more than one verse, you would number them Verse 1, 2, 3 as needed. 
-If you find the verse has too many lines for your screen, you can edit and 
-shorten the verse and :guilabel:`Add` another slide. 
-
-Authors, Topics & Song Book
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Once your *Title & Lyrics* are added or edited the way you want them you must 
-add or enter the author or authors of the song. OpenLP requires all songs to 
-have an author entered. You can add a blank space for the author name.
-
-.. image:: pics/song_edit_authors.png
-
-**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 accidently 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.
-
-.. image:: pics/song_edit_maintenance.png
-
-**Add:** Clicking the :guilabel:`Add` button will bring up a box where you will
-add the Authors First name, Last name and Display name. Click :guilabel:`Save`
-when you are finished.
-
-.. image:: pics/song_edit_author_maintenance.png
-
-**Edit:** The :guilabel:`Edit` button will bring up window where you can edit
-the info that is already there.
-
-**Delete:** The :guilabel:`Delete` button will remove the author you have 
-highlighted. Note: You cannot delete an author that is assigned to a song. 
-Authors names are displayed in the footer.
-
-Theme, Copyright info & Comments
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-On this tab you can assign a *Theme* to a song, enter the *Copyright information*
-and add the *CCLI number*. If you imported a song from SongSelect this 
-information will usually be entered.
-
-.. image:: pics/song_edit_theme_copyright.png
-
-**Theme:** Click the drop down arrow to display your list of themes or start 
-typing a theme name in the box and the list will appear. You can also create a 
-new theme by clicking the :guilabel:`New Theme` button. 
-
-**Copyright information:** Add or edit the copyright information in this box. If 
-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
-
-**Comments:** You can add comments in this box. This information is not 
-dispayed in the footer.
+

=== modified file 'documentation/manual/source/troubleshooting.rst'
--- documentation/manual/source/troubleshooting.rst	2011-04-22 21:00:51 +0000
+++ documentation/manual/source/troubleshooting.rst	2011-04-26 18:12:33 +0000
@@ -175,17 +175,13 @@
 connection where you intend to use OpenLP you will need another scripture
 source. For more information about acquiring Bibles please see :ref:`bibleimporter`.
 
-OpenLP is using a large amount of RAM when showing a presentation
------------------------------------------------------------------
+I am using high amounts of RAM when showing PowerPoint or Impress slides
+------------------------------------------------------------------------
 
-OpenLP uses a large amount of RAM when showing a presentation due to the way it
-handles presentations. OpenLP itself is unable to show those presentations or
-load the presentation files, so it interacts with the presentation through
-either Microsoft PowerPoint or LibreOffice Impress. In order to show the slides
-in the slide controller, OpenLP requests that the presentation application
-export the slides to images, and then uses those images as slides. This results
-in a large amount of RAM being used, especially in presentations with more than
-about 20 slides.
+The reason OpenLP uses greater amounts of RAM is because it does not load the
+presentation by itself. OpenLP uses PowerPoint or Impress to load the 
+presentation. Then OpenLP displays images of each slide. This results in the 
+higher than expected RAM usage.
 
 OpenLP is not displaying correctly, or is not on the correct screen
 -------------------------------------------------------------------