HEAD

manual/source/configure.rst

@@ -30,24 +30,20 @@ on your keyboard to close the display window.
 Application Startup
 ^^^^^^^^^^^^^^^^^^^
 
-**Show blank screen warning:**
-
+*Show blank screen warning:*
   When this box is selected, you will get a warning when opening OpenLP that the 
   output display has been blanked. You may have blanked it and shut down the 
   program and this will warn you it is still blanked.
 
-**Automatically open the last service:**
-
+*Automatically open the last service:*
   When this box is selected, OpenLP will remember the last service you were 
   working on when you closed the program.
 
-**Show the splash screen:**
-
+*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**
-
+*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.
@@ -55,26 +51,21 @@ access.
 Application Settings
 ^^^^^^^^^^^^^^^^^^^^
 
-**Prompt to save before starting a new service**
-
+*Prompt to save before starting a new service*
   When this box is selected, OpenLP will prompt you to save the service you are
   working on before starting a new service.
 
-**Automatically preview next item in service**
-
+*Automatically preview next item in service*
   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**
-
+*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** 
-
+*Slide loop delay*
   This setting is the time delay in seconds if you want to continuously loop
   images, verses, or lyrics. This control timer is also accessible on the "live 
   toolbar.
@@ -82,8 +73,7 @@ toolbar.
 CCLI Details
 ^^^^^^^^^^^^
 
-**CCLI number** 
-
+*CCLI number*
   If you subscribe to CCLI, this box is for your License number. This number is
   also displayed in the Song Footer box.
 
@@ -113,21 +103,18 @@ Theme Level
 
 Choose from one of three options for the default use of your theme.
 
-**Song Level:**
-
+*Song Level:*
   With this level selected, your theme is associated with the song. The theme is
   controlled by adding or editing a song in the Song editor and  your song theme
   takes priority. If your song does not have a theme associated with it, OpenLP
   will use the theme set in the Service Manager.
 
-**Service Level:** 
-
+*Service Level:*
   With this level selected, your theme is controlled at the top of the Service
   Manager. Select your default service theme there. This setting will override
   your Song theme. 
 
-**Global Level:**
-
+*Global Level:*
   With this level selected, all songs and verses will use the theme selected on
   the left in the Global Theme drop down.
 
@@ -140,23 +127,19 @@ Advanced Tab
 UI Settings (user interface)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-**Number of recent files to display:**
- 
+*Number of recent files to display:*
   Set this number for OpenLP to remember your last files open. These will show 
   under File.
 
-**Remember active media manager tab on startup:**
- 
+*Remember active media manager tab on startup:*
   With this box selected OpenLP media manager will open on the same tab that it
   was closed on.
 
-**Double-click to send items straight to live:**
-
+*Double-click to send items straight to live:*
   With this box selected, double-clicking on anything in the Media Manager will
   immediately send it live instead of to Preview.
 
-**Expand new service items on creation:**
-
+*Expand new service items on creation:*
   With this box selected, everything you add to the Service Manager will be
   expanded so you can see all the verses, lyrics and presentations, line by line.
   When you open OpenLP, everything will automatically be expanded in the Service
@@ -170,26 +153,22 @@ Songs Tab
 Songs Mode
 ^^^^^^^^^^
 
-**Enable search as you type:**
-
+*Enable search as you type:*
   With this box selected, Media Manager/Songs will display the song you are
   searching for as you are typing. If this box is not selected, you need to type
   in your search box and then click on the Search button.
 
-**Display verses on live tool bar:**
-
+*Display verses on live tool bar:*
   With this box selected, a Go To drop down box is available on the live toolbar 
   to select any part of the verse type you want displayed live. 
 
-**Update service from song edit:**
-
+*Update service from song edit:*
   With this box selected and you edit a song in the media manager, the results
   will also change the song if it is added to the Service Manager. If this box
   is not selected, your song edit changes will only be available in the Service
   Manager if you add it again.
 
-**Add missing songs when opening service:**
-
+*Add missing songs when opening service:*
   With this box selected, when you open an order of service created on another
   computer, or if one of the songs are no longer in your Media Manager, it will
   automatically enter the song in your Songs Media Manager. If this box is not 
@@ -204,42 +183,36 @@ Bibles Tab
 Verse Display
 ^^^^^^^^^^^^^
 
-**Only show new chapter numbers:**
-
+*Only show new chapter numbers:*
   With this box selected, the live display of the verse will only show the
   chapter number and verse for the first verse, and just the verse numbers after
   that. If the chapter changes, the new chapter number will be displayed with the
   verse number for the first line, and only the verse number displayed thereafter.
 
-**Display style:**
-
+*Display style:*
   This option will put brackets around the chapter and verse numbers. You may
   select No Brackets or your bracket style from the drop down menu.
 
-**Layout style:**
-
+*Layout style:*
   There are three options to determine how your Bible verses are displayed. 
 
-`Verse Per Slide` will display one verse per slide.
-`Verse Per Line` will start each verse on a new line until the slide is full.
-`Continuous` will run all verses together separated by verse number and chapter
-if chapter is selected to show above.
+* *Verse Per Slide* will display one verse per slide.
+* *Verse Per Line* will start each verse on a new line until the slide is full.
+* *Continuous* will run all verses together separated by verse number and chapter if chapter is selected to show above.
 
-**Note: Changes do not affect verses already in the service.** 
-
-**Display second Bible verses:**
+Note: Changes do not affect verses already in the service.
 
+*Display second Bible verses:*
   OpenLP has the ability to display the same verse in two different Bible
   versions for comparison. With this option selected, there will be a Second
   choice in the Bible Media Manager to use this option. Verses will display with 
   one verse per slide with the second Bible verse below.   
 
-**Bible theme:**
-
+*Bible theme:*
   You may select your default Bible theme from this drop down box. This selected
   theme will only be used if your `Theme Level` is set at `Song Level`.
 
-**Note: Changes do not affect verses already in the service.** 
+Note: Changes do not affect verses already in the service.
 
 
 Presentations Tab
@@ -260,8 +233,7 @@ the presentation. You may select your default controllers here in this tab.
 Advanced
 ^^^^^^^^
 
-**Allow presentation application to be overridden**
-
+*Allow presentation application to be overridden*
   With this option selected, you will see `Present using` area with a dropdown 
   box on the Presentations toolbar  in Media Manager which gives you the option 
   to select the presentation program you want to use.
@@ -274,8 +246,7 @@ Media Tab
 Media Display
 ^^^^^^^^^^^^^
 
-**Use Phonon for video playback**
-
+*Use Phonon for video playback*
   If you are having trouble displaying media, selecting this box could help.
 
 Custom Tab:
@@ -286,13 +257,12 @@ Custom Tab:
 Custom Display
 ^^^^^^^^^^^^^^
 
-**Display Footer**
-
+*Display Footer*
   With this option selected, your Custom slide Title will be displayed in the
   footer. 
 
-**Note: If you have an entry in the Credits box of your custom slide, title and
-credits will always be displayed.**
+Note: If you have an entry in the Credits box of your custom slide, title and
+credits will always be displayed.
 
 Alerts Tab
 ==========
@@ -302,34 +272,27 @@ Alerts Tab
 Font
 ^^^^
 
-**Font name:** 
-
+*Font name:*
   Choose your desired font from the drop down menu
 
-**Font color:**
-
+*Font color:*
   Choose your font color here.
 
-**Background color:** 
-
+*Background color:*
   Choose the background color the font will be displayed on.
 
-**Font size:** 
-
+*Font size:*
   This will adjust the size of the font.
 
-**Alert timeout:**
-
+*Alert timeout:*
   This setting will determine how long your Alert will be displayed on the screen,
   in seconds.
 
-**Location:** 
-
+*Location:*
   Choose the location where you want the alert displayed on the
   screen, Top, Middle or Bottom.
 
-**Preview:** 
-
+*Preview:*
   Your choices will be displayed here.
 
 Remote Tab
@@ -353,25 +316,19 @@ Server Settings
 
 .. image:: pics/configureremotes.png
 
-**Serve on IP address:** 
-
-Put your projection computer's IP address here or use 
-0.0.0.0 which will display your IP address links below. 
-
-**Port Number:** 
+*Serve on IP address:*
+  Put your projection computer's IP address here or use 0.0.0.0 which will 
+  display your IP address links below. 
 
+*Port Number:*
   You can use the default port number or change it to another number. If you don't 
   understand this setting, you can leave it as is.
 
-**Remote URL:** 
+*Remote URL:*
+  This will show the address you will use in the remote computer web browser.
 
-This will show the address you will use in the remote computer
-web browser.
-
-**Stage view URL:** 
-
-This will show the address you will use in the remote 
-computer for Stage view.
+*Stage view URL:*
+  This will show the address you will use in the remote computer for Stage view.
 
 Finding your IP address
 ^^^^^^^^^^^^^^^^^^^^^^^
@@ -379,7 +336,7 @@ Finding your IP address
 If the Remote or Stage view URL are not showing you can manually find these
 settings. To find your projection computer's IP address use these steps below. 
 
-**Windows:** 
+*Windows:*
   
 Open *Command Prompt* and type::
   
@@ -389,7 +346,7 @@ Press the :kbd:`Enter` key and the output of your command will display the
 adapter IP address. The IP address will always have a format of xxx.xxx.xxx.xxx 
 where x is one to three digits long.
 
-**Linux:** 
+*Linux:*
 
 Open *Terminal* and type::
 
@@ -401,8 +358,7 @@ named "eth0". The IP address for your network card is just after "inet addr:" in
 the section with your network card's name. The IP address will always have a 
 format of xxx.xxx.xxx.xxx where x is one to three digits long.
 
-**OS X 10.6 or 10.5** 
-
+*OS X 10.6 or 10.5*
   From the Apple menu, select :menuselection:`System Preferences --> View --> Network`.
   In the Network preference window, click a network port (e.g., Ethernet, AirPort, 
   modem). If you are connected, you'll see its IP address under "Status:".

manual/source/creating_service.rst

@@ -9,7 +9,7 @@ under their respective categories. Using the Media Manager you will load new
 Media, Songs, Images, Bibles, or create a Custom slide as discussed earlier in
 :ref:`mediamanager`. 
 
-.. image:: pics/mediamanager.png
+.. image:: pics/mediamanager_songs.png
 
 On the right side of your screen at the top is the Service Manager. 
 

manual/source/dualmonitors.rst

@@ -102,16 +102,32 @@ assumes you have properly set up any proprietary drivers if needed. You
 should seek out your distributions documentation if this general guide does not
 work.
 
-GNOME
-^^^^^
+GNOME 2
+^^^^^^^
 
-This guide is for users of the GNOME desktop who do not use proprietary drivers.
-From most distros go to :menuselection:`System --> Preferences --> Display
-Settings (Monitors)`. Set up your projector with the correct resolution and make
-sure that :guilabel:`Same image on all monitors` is **unchecked**.
+This guide is for users of the GNOME 2 desktop who do not use proprietary 
+drivers. From most distros go to :menuselection:`System --> Preferences --> 
+Display Settings (Monitors)`. Set up your projector with the correct resolution
+and make sure that :guilabel:`Same image on all monitors` is **unchecked**.
 
 .. image:: pics/gnome.png
 
+GNOME 3
+^^^^^^^
+
+This guide is for users of the GNOME 3 or GNOME Shell desktop who do not use
+proprietary drivers. In GNOME shell in the search box type *Displays* or in 
+GNOME shell or fall back mode go to :menuselection:`Applications --> System Tools --> System Settings`
+then select Displays. Set up your projector with the correct resolution and
+make sure that :guilabel:`Mirror displays` is **unchecked**
+
+.. image:: pics/gnome3displays.png 
+
+If after setting up your monitors you have the top panel on the wrong monitor
+simply drag it to the monitor you want to serve as the primary screen.
+
+.. image:: pics/gnome3drag.png
+
 KDE
 ^^^
 
@@ -143,8 +159,8 @@ good idea to make a backup of any critical file before making changes::
 
   user@linux:~ $ sudo cp /etc/X11/xorg.conf /etc/X11/xorg.conf.old
 
-Or for those using systems that use the root user instead of sudo, change to
-root and enter::
+For those using systems that use the root user instead of sudo, change to root
+and enter::
 
   root@linux: # cp /etc/X11/xorg.conf /etc/X11/xorg.conf.old
 
@@ -158,7 +174,7 @@ terminal::
 
 Or, as root::
 
-  root@linux: # nividia-settings
+  root@linux: # nvidia-settings
 
 If you do not want to write the changes to your ``xorg.conf`` file simply run
 the nVidia Settings program (:command:`nvidia-settings`) from your desktop's
@@ -168,19 +184,19 @@ normal user run::
  user@linux:~ $ nvidia-settings
 
 Once you have opened nVidia Settings, click on :guilabel:`X Server Display
-Configuration`. Then select the monitor you are wanting to use as your second
+Configuration`. Select the monitor you are wanting to use as your second
 monitor and click :guilabel:`Configure`.
 
 .. image:: pics/nvlinux1.png
 
-After clicking :guilabel:`Configure`, select :guilabel:`TwinView`. Then click
+After clicking :guilabel:`Configure`, select :guilabel:`TwinView` and click
 :guilabel:`OK`.
 
 .. image:: pics/twinview.png
 
 Click :guilabel:`Apply` and if you are happy with the way things look click
-:guilabel:`Keep` to keep your new settings. Don't worry if all goes wrong the
-settings will return back to the previous settings in 15 seconds without any
+:guilabel:`Keep` to save your new settings. Don't worry if something goes wrong,
+the settings will return back to the previous settings in 15 seconds without any
 action. nVidia Settings should take care of selecting your optimum resolution
 etc, but that can be changed as needed. When you are happy with everything click
 on :guilabel:`Save to X Configuration File`.
@@ -209,7 +225,7 @@ sections on dual monitors with KDE and GNOME above.
 
 **Primary Monitor Issues**
 
-With certain cards your system may get confused on what is the primary display.
+With certain cards your system may get confused on which is the primary display.
 For example many users will be using a laptop. You will want your laptop screen 
 to be the primary screen, and your projector to be the secondary monitor.
 Certain Intel cards reverse this. To work around this you will need to know the

manual/source/faq.rst

@@ -5,16 +5,6 @@ Frequently Asked Questions
 General Questions
 =================
 
-When is the release date for OpenLP 2.0?
-----------------------------------------
-
-*It will be ready when it's ready!* We do not have fixed dates, but we have 
-set some `targets for the releases <http://wiki.openlp.org/Version_2_Milestones>`_.
-If you take part in the `development <http://wiki.openlp.org/Development:Getting_Started>`_,
-start to `test OpenLP <http://wiki.openlp.org/Testing:Getting_Started>`_ and 
-`provide feedback <http://wiki.openlp.org/Help:Contents>`_ this will speed up 
-the progress.
-
 Can I help with OpenLP?
 -----------------------
 
@@ -79,24 +69,6 @@ program a good test before using it in a live situation to ensure they won't
 encounter any unexpected problems. If you want to have a look at the latest beta 
 release then just `download it <http://openlp.org/en/download.html>`_.
 
-Should I use this beta release at Church in my Sunday services?
----------------------------------------------------------------
-
-As long as you have taken the time to run through your service a couple of times 
-on your target machine, the answer to this question is **yes**. The OpenLP 
-team believes that OpenLP 2.0 beta 1 is stable enough to be used in Sunday 
-services. As of beta 1, there are a good number of churches already using 
-version 2.0 successfully. The OpenLP team works hard to make sure each release 
-is solid, but cannot yet guarantee that everything works perfectly, or even 
-correctly.
-
-If however your congregation is made up of 85 year old women who snarl when you 
-suggest replacing the gas lamps with electric light bulbs and consider the pipe 
-organ too loud and modern, then we recommend sticking with version 1.2 for now.
-
-As of beta 1, version 1.2 of OpenLP is "put out to pasture" - no more 
-development or even bugfixes will be performed on that version.
-
 Upgrading
 =========
 
@@ -180,15 +152,6 @@ unlikely you'll get an exact match.
 Using OpenLP
 ============
 
-Is there a manual or any documentation for 2.0?
------------------------------------------------
-
-Some folks are working on a brand new manual for OpenLP 2.0. You can find the 
-latest version of this manual at http://manual.openlp.org. If you need help, 
-use the live chat feature or ask in the forums. If you would like to help write 
-the manual, please let us know - we are always happy for new volunteers to join 
-the team and contribute to the project.
-
 I've started OpenLP, but I can't see the songs or bibles section in the Media Manager
 -------------------------------------------------------------------------------------
 
@@ -261,7 +224,7 @@ OSIS
     ``<name>.osis`` file and import your Bible.
 
 OpenSong
-    OpenSong have a good selection of Bibles on their
+    OpenSong has a good selection of Bibles on their
     `download page <http://www.opensong.org/d/downloads#bible_translations>`_.
 
 Web Download

manual/source/glossary.rst

@@ -27,7 +27,7 @@ Media Manager
 The Media Manager contains a number of tabs the plugins supply to OpenLP.
 Each tab in the Media Manager is called a **Media Item**
 
-.. image:: pics/mediamanager.png
+.. image:: pics/mediamanager_songs.png
 
 From the Media Manager you can send Media Items to the Preview or Live screens.
 

manual/source/index.rst

@@ -13,6 +13,7 @@ Getting Started With OpenLP
    :maxdepth: 2
 
    introduction
+   system_requirements
    install_windows_mac
    install_linux
    install_bsd
@@ -29,10 +30,10 @@ Reference Manual
    configure
    dualmonitors
    wizard
-   glossary
    mediamanager
    songs
    themes
+   glossary
 
 Questions and Troubleshooting
 -----------------------------

manual/source/mediamanager.rst

@@ -7,7 +7,7 @@ Media Manager
 Once you get your system set up for OpenLP you will be ready to add content to
 your Service Manager. This will all happen through the :ref:`media-manager`. The
 :ref:`media-manager` contains all the Bibles, Songs, Presentations, Media, and 
-everything else that you will project through OpenLP.
+Slides that you will project through OpenLP.
 
 Enabling the Plugins
 --------------------
@@ -308,10 +308,10 @@ Using the buttons you can:
 
 Right clicking on a Media file will bring up some of the same options.
 
-Custom
-^^^^^^
-Custom gives you the option of creating your own slide. This could be useful for 
-displaying readings, liturgy or any text that may not be found in Songs or 
+Custom Slides
+^^^^^^^^^^^^^
+Custom Slides gives you the option of creating your own slide. This is useful 
+for displaying readings, liturgy or any text that may not be found in Songs or 
 Bibles.
 
 .. image:: pics/mediamanager_custom.png
@@ -320,31 +320,33 @@ Using the buttons you can:
 
 .. image:: pics/mediamanager_custom_buttons.png
 
-*Add a new Custom:*
-  Brings up the dialog box to add a new Custom display. *Edit the selected Custom:* 
-  Brings up the dialog box to make changes to the Custom display.
+*Add a new custom slide:*
+  Brings up the dialog box to add a new Custom slide display. 
 
-*Delete the selected Custom:*
-  Remove the Custom from your list.
+*Edit the selected custom slide:* 
+  Brings up the dialog box to make changes to the custom slide.
 
-*Preview the selected Custom:*
+*Delete the selected custom slide:*
+  Removes the custom slide from your list.
+
+*Preview the selected custom slide:*
   Lets you see what your Custom will look like displayed live.
 
-*Send the selected Custom live:*
-  This option will immediately display your Custom live.
+*Send the selected custom slide live:*
+  This option will immediately display your custom slide live.
 
-*Add the selected Custom to the service:*
-  This will enter your Custom slide in the Service Manager. You can also drag 
-  your Custom slide over to the Service Manager.
+*Add the selected custom slide to the service:*
+  This will enter your custom slide in the Service Manager. You can also drag 
+  your custom slide over to the Service Manager.
 
-Right clicking on a Custom file will bring up some of the same options.
+Right clicking on a custom slide file will bring up some of the same options.
 
-When you Add a new Custom slide a dialog box will appear. 
+When you Add a new custom slide a dialog box will appear. 
 
 .. image:: pics/mediamanager_custom_edit.png
 
 *Title:*
-  Name of your Custom slide.
+  Name of your custom slide.
 
 *Add:*
   After clicking on Add you will enter your text you want to display in this box. 
@@ -360,7 +362,7 @@ When you Add a new Custom slide a dialog box will appear.
 
 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 
-arrows to change the arrangement of your Custom slide.
+arrows to change the arrangement of your custom slide.
 
 .. These are all the image templates that are used in this page.
 

manual/source/system_requirements.rst

@@ -0,0 +1,22 @@
+===========================
+Minimum System Requirements
+===========================
+
+OpenLP should run well on any fairly recent machine. The following are suggested
+specifications to get reasonable performance. It may be possible to run OpenLP
+on less powerful hardware but you may not get the performance you desire.
+
+* 2Ghz CPU
+* 1GB RAM
+* 100MB free disk space
+* Windows XP/Vista/Windows 7, Linux, Mac OS X (10.5 or greater), Free BSD
+* Multiple Monitor Support is highly recommended (not required)
+* For Presentation support:
+
+  * Windows: PowerPoint XP or later, PowerPoint Viewer 2003 or 2007,
+    OpenOffie.org Impress 3.2 or LibreOffice Impress 3.3
+  * Linux: OpenOffice.org Impress 3.2 or LibreOffice Impress 3.3
+  * Mac: Not supported yet
+* The Generic Document/Presentation and Songs of Fellowship song import options
+  require OpenOffice.org 3.2 or LibreOffice 3.3
+