openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/documentation into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/documentation/+merge/57958

Clean up the Bible import section a bit.
-- 
https://code.launchpad.net/~raoul-snyman/openlp/documentation/+merge/57958
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/documentation into lp:openlp.

=== modified file 'documentation/manual/source/bibles.rst'
--- documentation/manual/source/bibles.rst	2011-04-01 19:16:45 +0000
+++ documentation/manual/source/bibles.rst	2011-04-15 21:29:29 +0000
@@ -21,20 +21,35 @@
 
 .. image:: pics/bibleimport01.png
 
-After clicking :guilabel:`Next` you can select from the various types of 
-software that OpenLP will convert Bibles from.
+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.
 
 .. image:: pics/bibleimport02.png
 
-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.
+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.
 
 Windows XP::
 
@@ -44,22 +59,15 @@
 
     C:\ProgramData\openlp.org\Data\Bibles\
 
-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.
+After selecting all of the openlp.org 1.x Bibles you want to convert, click
+:guilabel:`Next` to continue the import process.
 
 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
@@ -69,24 +77,11 @@
 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 Command Prompt in 
-Windows or a Terminal in Linux or MAC you would type::
+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::
 
     mod2osis biblename > biblename.osis
 
@@ -114,17 +109,9 @@
 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 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.
+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.
 
 Importing Web Download Bibles
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -139,8 +126,6 @@
 
 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.
@@ -154,30 +139,20 @@
 .. image:: pics/webbibleproxy1.png
 
 After selecting your download location and the Bible you wish to use, click
-:guilabel:`Next` When your import is completed click :guilabel:`Finish`
-
-.. image:: pics/biblewebcomplete.png
-
-You should now be ready to use the web bible.
+:guilabel:`Next` to continue the import process. When your import is completed
+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.
-
-.. image:: pics/bibleimport02.png
+consist of two files a `books` file and a `verse` file. Select CSV from the list
+of Bible types to import.
 
 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 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
+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.