openlp-core team mailing list archive

[Wesley Stout <wesleystout@xxxxxxxxx>]

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

Requested reviews:
  OpenLP Core (openlp-core)

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

Mainly a reordering of the documentation, along with an added section on installation. http://204.116.127.107/openlp/index.html to see the new order
-- 
https://code.launchpad.net/~wesleystout/openlp/documentation/+merge/59725
Your team OpenLP Core is requested to review the proposed merge of lp:~wesleystout/openlp/documentation into lp:openlp.

=== 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-05-03 02:11:39 +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-05-03 02:11:39 +0000
@@ -0,0 +1,66 @@
+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.

=== 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-05-03 02:11:39 +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-05-03 02:11:39 +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-05-03 02:11:39 +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-05-03 02:11:39 +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-05-03 02:11:39 +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-05-03 02:11:39 +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-05-03 02:11:39 +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-05-03 02:11:39 +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-05-03 02:11:39 +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-05-03 02:11:39 +0000 differ