← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~jseagull1/openlp/documentation into lp:openlp

 

John Cegalis has proposed merging lp:~jseagull1/openlp/documentation into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

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

Updated Loop Timer per bug https://bugs.launchpad.net/bugs/801987
Rewrote it and added a couple images.
The rest of the file still needs updated to the new format.
-- 
https://code.launchpad.net/~jseagull1/openlp/documentation/+merge/65982
Your team OpenLP Core is requested to review the proposed merge of lp:~jseagull1/openlp/documentation into lp:openlp.
=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2011-06-27 13:34:22 +0000
@@ -0,0 +1,1 @@
+build

=== renamed file '.bzrignore' => '.bzrignore.moved'
=== added file 'PluginDevelopersGuide.txt'
--- PluginDevelopersGuide.txt	1970-01-01 00:00:00 +0000
+++ PluginDevelopersGuide.txt	2011-06-27 13:34:22 +0000
@@ -0,0 +1,8 @@
+openlp.org 2.x Plugin Developer's Guide
+========================================================================
+
+Introduction
+------------
+This document will show you how to write your own module for openlp.org.
+openlp.org has been written in plugins so that you can add your own
+functionality to openlp.org.

=== added directory 'api'
=== added file 'api/Makefile'
--- api/Makefile	1970-01-01 00:00:00 +0000
+++ api/Makefile	2011-06-27 13:34:22 +0000
@@ -0,0 +1,88 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
+
+.PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html      to make standalone HTML files"
+	@echo "  dirhtml   to make HTML files named index.html in directories"
+	@echo "  pickle    to make pickle files"
+	@echo "  json      to make JSON files"
+	@echo "  htmlhelp  to make HTML files and a HTML help project"
+	@echo "  qthelp    to make HTML files and a qthelp project"
+	@echo "  latex     to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  changes   to make an overview of all changed/added/deprecated items"
+	@echo "  linkcheck to check all external links for integrity"
+	@echo "  doctest   to run all doctests embedded in the documentation (if enabled)"
+
+clean:
+	-rm -rf build/*
+
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) build/html
+	@echo
+	@echo "Build finished. The HTML pages are in build/html."
+
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) build/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in build/dirhtml."
+
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) build/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) build/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) build/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in build/htmlhelp."
+
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) build/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in build/qthelp, like this:"
+	@echo "# qcollectiongenerator build/qthelp/OpenLP.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile build/qthelp/OpenLP.qhc"
+
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) build/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in build/latex."
+	@echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
+	      "run these through (pdf)latex."
+
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) build/changes
+	@echo
+	@echo "The overview file is in build/changes."
+
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) build/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in build/linkcheck/output.txt."
+
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) build/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in build/doctest/output.txt."

=== added file 'api/make.bat'
--- api/make.bat	1970-01-01 00:00:00 +0000
+++ api/make.bat	2011-06-27 13:34:22 +0000
@@ -0,0 +1,112 @@
+@ECHO OFF
+
+REM Command file for Sphinx documentation
+
+set SPHINXBUILD=sphinx-build
+set ALLSPHINXOPTS=-d build/doctrees %SPHINXOPTS% source
+if NOT "%PAPER%" == "" (
+	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
+)
+
+if "%1" == "" goto help
+
+if "%1" == "help" (
+	:help
+	echo.Please use `make ^<target^>` where ^<target^> is one of
+	echo.  html      to make standalone HTML files
+	echo.  dirhtml   to make HTML files named index.html in directories
+	echo.  pickle    to make pickle files
+	echo.  json      to make JSON files
+	echo.  htmlhelp  to make HTML files and a HTML help project
+	echo.  qthelp    to make HTML files and a qthelp project
+	echo.  latex     to make LaTeX files, you can set PAPER=a4 or PAPER=letter
+	echo.  changes   to make an overview over all changed/added/deprecated items
+	echo.  linkcheck to check all external links for integrity
+	echo.  doctest   to run all doctests embedded in the documentation if enabled
+	goto end
+)
+
+if "%1" == "clean" (
+	for /d %%i in (build\*) do rmdir /q /s %%i
+	del /q /s build\*
+	goto end
+)
+
+if "%1" == "html" (
+	%SPHINXBUILD% -b html %ALLSPHINXOPTS% build/html
+	echo.
+	echo.Build finished. The HTML pages are in build/html.
+	goto end
+)
+
+if "%1" == "dirhtml" (
+	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% build/dirhtml
+	echo.
+	echo.Build finished. The HTML pages are in build/dirhtml.
+	goto end
+)
+
+if "%1" == "pickle" (
+	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% build/pickle
+	echo.
+	echo.Build finished; now you can process the pickle files.
+	goto end
+)
+
+if "%1" == "json" (
+	%SPHINXBUILD% -b json %ALLSPHINXOPTS% build/json
+	echo.
+	echo.Build finished; now you can process the JSON files.
+	goto end
+)
+
+if "%1" == "htmlhelp" (
+	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% build/htmlhelp
+	echo.
+	echo.Build finished; now you can run HTML Help Workshop with the ^
+.hhp project file in build/htmlhelp.
+	goto end
+)
+
+if "%1" == "qthelp" (
+	%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% build/qthelp
+	echo.
+	echo.Build finished; now you can run "qcollectiongenerator" with the ^
+.qhcp project file in build/qthelp, like this:
+	echo.^> qcollectiongenerator build\qthelp\OpenLP.qhcp
+	echo.To view the help file:
+	echo.^> assistant -collectionFile build\qthelp\OpenLP.ghc
+	goto end
+)
+
+if "%1" == "latex" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% build/latex
+	echo.
+	echo.Build finished; the LaTeX files are in build/latex.
+	goto end
+)
+
+if "%1" == "changes" (
+	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% build/changes
+	echo.
+	echo.The overview file is in build/changes.
+	goto end
+)
+
+if "%1" == "linkcheck" (
+	%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% build/linkcheck
+	echo.
+	echo.Link check complete; look for any errors in the above output ^
+or in build/linkcheck/output.txt.
+	goto end
+)
+
+if "%1" == "doctest" (
+	%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% build/doctest
+	echo.
+	echo.Testing of doctests in the sources finished, look at the ^
+results in build/doctest/output.txt.
+	goto end
+)
+
+:end

=== added directory 'api/source'
=== added directory 'api/source/_static'
=== added directory 'api/source/_templates'
=== added file 'api/source/conf.py'
--- api/source/conf.py	1970-01-01 00:00:00 +0000
+++ api/source/conf.py	2011-06-27 13:34:22 +0000
@@ -0,0 +1,202 @@
+# -*- coding: utf-8 -*-
+#
+# OpenLP documentation build configuration file, created by
+# sphinx-quickstart on Fri Jul 10 17:20:40 2009.
+#
+# This file is execfile()d with the current directory set to its containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import os
+import sys
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+sys.path.insert(0, os.path.abspath(os.path.join('..', '..', '..')))
+
+# -- General configuration -----------------------------------------------------
+
+# Add any Sphinx extension module names here, as strings. They can be extensions
+# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+extensions = ['sphinx.ext.autodoc']
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix of source filenames.
+source_suffix = '.rst'
+
+# The encoding of source files.
+source_encoding = 'utf-8'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'OpenLP'
+copyright = u'2004-2010, Raoul Snyman'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '2.0'
+# The full version, including alpha/beta/rc tags.
+release = '1.9.3'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of documents that shouldn't be included in the build.
+#unused_docs = []
+
+# List of directories, relative to source directory, that shouldn't be searched
+# for source files.
+exclude_trees = []
+
+# The reST default role (used for this markup: `text`) to use for all documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+add_module_names = False
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+
+# -- Options for HTML output ---------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  Major themes that come with
+# Sphinx are currently 'default' and 'sphinxdoc'.
+html_theme = 'default'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+html_theme_options = {
+    'sidebarbgcolor': '#3a60a9',
+    'relbarbgcolor': '#203b6f',
+    'footerbgcolor': '#26437c',
+    'headtextcolor': '#203b6f',
+    'linkcolor': '#26437c',
+    'sidebarlinkcolor': '#ceceff'
+}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents.  If None, it defaults to
+# "<project> v<release> documentation".
+html_title = 'OpenLP 2.0 Developer API'
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_use_modindex = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = ''
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'OpenLP-2.0-api'
+
+
+# -- Options for LaTeX output --------------------------------------------------
+
+# The paper size ('letter' or 'a4').
+#latex_paper_size = 'letter'
+
+# The font size ('10pt', '11pt' or '12pt').
+#latex_font_size = '10pt'
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title, author, documentclass [howto/manual]).
+latex_documents = [
+  ('index', 'OpenLP.tex', u'OpenLP 2.0 Developer API',
+   u'Raoul Snyman', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# Additional stuff for the LaTeX preamble.
+#latex_preamble = ''
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_use_modindex = True

=== added directory 'api/source/core'
=== added file 'api/source/core/index.rst'
--- api/source/core/index.rst	1970-01-01 00:00:00 +0000
+++ api/source/core/index.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,15 @@
+.. _core-index:
+
+:mod:`core` Module
+==================
+
+.. automodule:: openlp.core
+   :members:
+
+.. toctree::
+   :maxdepth: 2
+
+   lib
+   theme
+   ui
+   utils
\ No newline at end of file

=== added file 'api/source/core/lib.rst'
--- api/source/core/lib.rst	1970-01-01 00:00:00 +0000
+++ api/source/core/lib.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,67 @@
+.. _core-lib:
+
+Object Library
+==============
+
+.. automodule:: openlp.core.lib
+   :members:
+
+:mod:`EventReceiver`
+--------------------
+
+.. autoclass:: openlp.core.lib.eventreceiver.EventReceiver
+   :members:
+
+:mod:`ListWidgetWithDnD`
+------------------------
+
+.. autoclass:: openlp.core.lib.listwidgetwithdnd.ListWidgetWithDnD
+   :members:
+
+:mod:`MediaManagerItem`
+-----------------------
+
+.. autoclass:: openlp.core.lib.mediamanageritem.MediaManagerItem
+   :members:
+
+:mod:`Plugin`
+-------------
+
+.. autoclass:: openlp.core.lib.plugin.Plugin
+   :members:
+
+:mod:`PluginManager`
+--------------------
+
+.. autoclass:: openlp.core.lib.pluginmanager.PluginManager
+   :members:
+
+:mod:`Renderer`
+---------------
+
+.. autoclass:: openlp.core.lib.renderer.Renderer
+   :members:
+
+:mod:`RenderManager`
+--------------------
+
+.. autoclass:: openlp.core.lib.rendermanager.RenderManager
+   :members:
+
+:mod:`ServiceItem`
+------------------
+
+.. autoclass:: openlp.core.lib.serviceitem.ServiceItem
+   :members:
+
+:mod:`SettingsTab`
+------------------
+
+.. autoclass:: openlp.core.lib.settingstab.SettingsTab
+   :members:
+
+:mod:`OpenLPToolbar`
+--------------------
+
+.. autoclass:: openlp.core.lib.toolbar.OpenLPToolbar
+   :members:

=== added file 'api/source/core/theme.rst'
--- api/source/core/theme.rst	1970-01-01 00:00:00 +0000
+++ api/source/core/theme.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,10 @@
+.. _core-theme:
+
+Theme Function Library
+======================
+
+.. automodule:: openlp.core.theme
+   :members:
+
+.. autoclass:: openlp.core.theme.theme.Theme
+   :members:

=== added file 'api/source/core/ui.rst'
--- api/source/core/ui.rst	1970-01-01 00:00:00 +0000
+++ api/source/core/ui.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,27 @@
+.. _core-ui:
+
+User Interface
+==============
+
+.. automodule:: openlp.core.ui
+
+Main Windows
+------------
+
+.. autoclass:: openlp.core.ui.mainwindow.MainWindow
+   :members:
+
+.. autoclass:: openlp.core.ui.maindisplay.MainDisplay
+   :members:
+
+Managers
+--------
+
+.. autoclass:: openlp.core.ui.servicemanager.ServiceManager
+   :members:
+
+.. autoclass:: openlp.core.ui.mediadockmanager.MediaDockManager
+   :members:
+
+.. autoclass:: openlp.core.ui.thememanager.ThemeManager
+   :members:

=== added file 'api/source/core/utils.rst'
--- api/source/core/utils.rst	1970-01-01 00:00:00 +0000
+++ api/source/core/utils.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,7 @@
+.. _core-utils:
+
+Utilities
+=========
+
+.. automodule:: openlp.core.utils
+   :members:

=== added file 'api/source/index.rst'
--- api/source/index.rst	1970-01-01 00:00:00 +0000
+++ api/source/index.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,27 @@
+.. OpenLP documentation master file, created by
+   sphinx-quickstart on Fri Jul 10 17:20:40 2009.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Welcome
+=======
+
+Welcome to the OpenLP 2.0 API Documentation! In here you will find all
+information relating to OpenLP's core classes, core plugins, and anything else
+deemed necessary or interesting by the developers.
+
+Contents:
+
+.. toctree::
+   :maxdepth: 2
+
+   core/index
+   plugins/index
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+

=== added directory 'api/source/plugins'
=== added file 'api/source/plugins/alerts.rst'
--- api/source/plugins/alerts.rst	1970-01-01 00:00:00 +0000
+++ api/source/plugins/alerts.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,31 @@
+.. _plugins-alerts:
+
+Alerts Plugin
+=============
+
+.. automodule:: openlp.plugins.alerts
+   :members:
+
+Plugin Class
+------------
+
+.. autoclass:: openlp.plugins.alerts.alertsplugin.AlertsPlugin
+   :members:
+
+Forms
+-----
+
+.. automodule:: openlp.plugins.alerts.forms
+   :members:
+
+.. autoclass:: openlp.plugins.alerts.forms.alertform.AlertForm
+   :members:
+
+Helper Classes & Functions
+--------------------------
+
+.. automodule:: openlp.plugins.alerts.lib
+   :members:
+
+.. automodule:: openlp.plugins.alerts.lib.db
+   :members:

=== added file 'api/source/plugins/bibles.rst'
--- api/source/plugins/bibles.rst	1970-01-01 00:00:00 +0000
+++ api/source/plugins/bibles.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,55 @@
+.. _plugins-bibles:
+
+Bibles Plugin
+=============
+
+.. automodule:: openlp.plugins.bibles
+   :members:
+
+Plugin Class
+------------
+
+.. autoclass:: openlp.plugins.bibles.bibleplugin.BiblePlugin
+   :members:
+
+Forms
+-----
+
+.. automodule:: openlp.plugins.bibles.forms
+   :members:
+
+.. autoclass:: openlp.plugins.bibles.forms.bibleimportform.BibleImportForm
+   :members:
+
+Helper Classes & Functions
+--------------------------
+
+.. automodule:: openlp.plugins.bibles.lib
+   :members:
+
+.. automodule:: openlp.plugins.bibles.lib.db
+   :members:
+
+.. automodule:: openlp.plugins.bibles.lib.biblestab
+   :members:
+
+.. automodule:: openlp.plugins.bibles.lib.manager
+   :members:
+
+.. automodule:: openlp.plugins.bibles.lib.mediaitem
+   :members:
+
+Bible Importers
+---------------
+
+.. automodule:: openlp.plugins.bibles.lib.csvbible
+   :members:
+
+.. automodule:: openlp.plugins.bibles.lib.http
+   :members:
+
+.. automodule:: openlp.plugins.bibles.lib.osis
+   :members:
+
+.. automodule:: openlp.plugins.bibles.lib.opensong
+   :members:

=== added file 'api/source/plugins/custom.rst'
--- api/source/plugins/custom.rst	1970-01-01 00:00:00 +0000
+++ api/source/plugins/custom.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,34 @@
+.. _plugins-custom:
+
+Custom Slides Plugin
+====================
+
+.. automodule:: openlp.plugins.custom
+   :members:
+
+Plugin Class
+------------
+
+.. autoclass:: openlp.plugins.custom.customplugin.CustomPlugin
+   :members:
+
+Forms
+-----
+
+.. automodule:: openlp.plugins.custom.forms
+   :members:
+
+.. autoclass:: openlp.plugins.custom.forms.editcustomform.EditCustomForm
+   :members:
+
+.. autoclass:: openlp.plugins.custom.forms.editcustomslideform.EditCustomSlideForm
+   :members:
+
+Helper Classes & Functions
+--------------------------
+
+.. automodule:: openlp.plugins.custom.lib
+   :members:
+
+.. automodule:: openlp.plugins.custom.lib.mediaitem
+   :members:

=== added file 'api/source/plugins/images.rst'
--- api/source/plugins/images.rst	1970-01-01 00:00:00 +0000
+++ api/source/plugins/images.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,22 @@
+.. _plugins-images:
+
+Images Plugin
+=============
+
+.. automodule:: openlp.plugins.images
+   :members:
+
+Plugin Class
+------------
+
+.. autoclass:: openlp.plugins.images.imageplugin.ImagePlugin
+   :members:
+
+Helper Classes & Functions
+--------------------------
+
+.. automodule:: openlp.plugins.images.lib
+   :members:
+
+.. automodule:: openlp.plugins.images.lib.mediaitem
+   :members:

=== added file 'api/source/plugins/index.rst'
--- api/source/plugins/index.rst	1970-01-01 00:00:00 +0000
+++ api/source/plugins/index.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,20 @@
+.. _plugins-index:
+
+Plugins
+=======
+
+.. automodule:: openlp.plugins
+   :members:
+
+.. toctree::
+   :maxdepth: 2
+
+   songs
+   bibles
+   presentations
+   media
+   images
+   custom
+   remotes
+   songusage
+   alerts

=== added file 'api/source/plugins/media.rst'
--- api/source/plugins/media.rst	1970-01-01 00:00:00 +0000
+++ api/source/plugins/media.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,22 @@
+.. _plugins-media:
+
+Media Plugin
+============
+
+.. automodule:: openlp.plugins.media
+   :members:
+
+Plugin Class
+------------
+
+.. autoclass:: openlp.plugins.media.mediaplugin.MediaPlugin
+   :members:
+
+Helper Classes & Functions
+--------------------------
+
+.. automodule:: openlp.plugins.media.lib
+   :members:
+
+.. automodule:: openlp.plugins.media.lib.mediaitem
+   :members:

=== added file 'api/source/plugins/presentations.rst'
--- api/source/plugins/presentations.rst	1970-01-01 00:00:00 +0000
+++ api/source/plugins/presentations.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,40 @@
+.. _plugins-presentations:
+
+Presentations Plugin
+====================
+
+Plugin Class
+------------
+
+.. autoclass:: openlp.plugins.presentations.presentationplugin.PresentationPlugin
+   :members:
+
+Helper Classes & Functions
+--------------------------
+
+.. automodule:: openlp.plugins.presentations.lib
+   :members:
+
+.. automodule:: openlp.plugins.presentations.lib.mediaitem
+   :members:
+
+.. automodule:: openlp.plugins.presentations.lib.presentationtab
+   :members:
+
+.. automodule:: openlp.plugins.presentations.lib.messagelistener
+   :members:
+
+.. automodule:: openlp.plugins.presentations.lib.presentationcontroller
+   :members:
+
+Presentation Application Controllers
+------------------------------------
+
+.. automodule:: openlp.plugins.presentations.lib.impresscontroller
+   :members:
+
+.. automodule:: openlp.plugins.presentations.lib.pptviewcontroller
+   :members:
+
+.. automodule:: openlp.plugins.presentations.lib.powerpointcontroller
+   :members:

=== added file 'api/source/plugins/remotes.rst'
--- api/source/plugins/remotes.rst	1970-01-01 00:00:00 +0000
+++ api/source/plugins/remotes.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,25 @@
+.. _plugins-remotes:
+
+Remotes Plugin
+==============
+
+.. automodule:: openlp.plugins.remotes
+   :members:
+
+Plugin Class
+------------
+
+.. autoclass:: openlp.plugins.remotes.remoteplugin.RemotesPlugin
+   :members:
+
+Helper Classes & Functions
+--------------------------
+
+.. automodule:: openlp.plugins.remotes.lib
+   :members:
+
+.. autoclass:: openlp.plugins.remotes.lib.httpserver.HttpConnection
+   :members:
+
+.. autoclass:: openlp.plugins.remotes.lib.httpserver.HttpResponse
+   :members:

=== added file 'api/source/plugins/songs.rst'
--- api/source/plugins/songs.rst	1970-01-01 00:00:00 +0000
+++ api/source/plugins/songs.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,97 @@
+.. _plugins-songs:
+
+Songs Plugin
+============
+
+.. automodule:: openlp.plugins.songs
+   :members:
+
+Plugin Class
+------------
+
+.. autoclass:: openlp.plugins.songs.songsplugin.SongsPlugin
+   :members:
+
+Forms
+-----
+
+.. automodule:: openlp.plugins.songs.forms
+   :members:
+
+.. autoclass:: openlp.plugins.songs.forms.authorsform.AuthorsForm
+   :members:
+
+.. autoclass:: openlp.plugins.songs.forms.editsongform.EditSongForm
+   :members:
+
+.. autoclass:: openlp.plugins.songs.forms.editverseform.EditVerseForm
+   :members:
+
+.. autoclass:: openlp.plugins.songs.forms.songbookform.SongBookForm
+   :members:
+
+.. autoclass:: openlp.plugins.songs.forms.songimportform.SongImportForm
+   :members:
+
+.. autoclass:: openlp.plugins.songs.forms.songmaintenanceform.SongMaintenanceForm
+   :members:
+
+.. autoclass:: openlp.plugins.songs.forms.topicsform.TopicsForm
+   :members:
+
+Helper Classes & Functions
+--------------------------
+
+.. automodule:: openlp.plugins.songs.lib
+   :members:
+
+.. automodule:: openlp.plugins.songs.lib.db
+   :members:
+
+.. automodule:: openlp.plugins.songs.lib.importer
+   :members:
+
+.. automodule:: openlp.plugins.songs.lib.mediaitem
+   :members:
+
+.. automodule:: openlp.plugins.songs.lib.songimport
+   :members:
+
+.. automodule:: openlp.plugins.songs.lib.songstab
+   :members:
+
+.. automodule:: openlp.plugins.songs.lib.xml
+   :members:
+
+Song Importers
+--------------
+
+.. automodule:: openlp.plugins.songs.lib.cclifileimport
+   :members:
+
+.. automodule:: openlp.plugins.songs.lib.ewimport
+   :members:
+
+.. autoclass:: openlp.plugins.songs.lib.ewimport.FieldDescEntry
+   :members:
+
+.. automodule:: openlp.plugins.songs.lib.olp1import
+   :members:
+
+.. automodule:: openlp.plugins.songs.lib.olpimport
+   :members:
+
+.. automodule:: openlp.plugins.songs.lib.oooimport
+   :members:
+
+.. automodule:: openlp.plugins.songs.lib.opensongimport
+   :members:
+
+.. automodule:: openlp.plugins.songs.lib.sofimport
+   :members:
+
+.. automodule:: openlp.plugins.songs.lib.songbeamerimport
+   :members:
+
+.. automodule:: openlp.plugins.songs.lib.wowimport
+   :members:

=== added file 'api/source/plugins/songusage.rst'
--- api/source/plugins/songusage.rst	1970-01-01 00:00:00 +0000
+++ api/source/plugins/songusage.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,34 @@
+.. _plugins-songusage:
+
+Song Usage Plugin
+=================
+
+.. automodule:: openlp.plugins.songusage
+   :members:
+
+Plugin Class
+------------
+
+.. autoclass:: openlp.plugins.songusage.songusageplugin.SongUsagePlugin
+   :members:
+
+Forms
+-----
+
+.. automodule:: openlp.plugins.songusage.forms
+   :members:
+
+.. autoclass:: openlp.plugins.songusage.forms.songusagedeleteform.SongUsageDeleteForm
+   :members:
+
+.. autoclass:: openlp.plugins.songusage.forms.songusagedetailform.SongUsageDetailForm
+   :members:
+
+Helper Classes & Functions
+--------------------------
+
+.. automodule:: openlp.plugins.songusage.lib
+   :members:
+
+.. automodule:: openlp.plugins.songusage.lib.db
+   :members:

=== added directory 'manual'
=== added file 'manual/Makefile'
--- manual/Makefile	1970-01-01 00:00:00 +0000
+++ manual/Makefile	2011-06-27 13:34:22 +0000
@@ -0,0 +1,88 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
+
+.PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html      to make standalone HTML files"
+	@echo "  dirhtml   to make HTML files named index.html in directories"
+	@echo "  pickle    to make pickle files"
+	@echo "  json      to make JSON files"
+	@echo "  htmlhelp  to make HTML files and a HTML help project"
+	@echo "  qthelp    to make HTML files and a qthelp project"
+	@echo "  latex     to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  changes   to make an overview of all changed/added/deprecated items"
+	@echo "  linkcheck to check all external links for integrity"
+	@echo "  doctest   to run all doctests embedded in the documentation (if enabled)"
+
+clean:
+	-rm -rf build/*
+
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) build/html
+	@echo
+	@echo "Build finished. The HTML pages are in build/html."
+
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) build/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in build/dirhtml."
+
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) build/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) build/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) build/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in build/htmlhelp."
+
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) build/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in build/qthelp, like this:"
+	@echo "# qcollectiongenerator build/qthelp/OpenLP.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile build/qthelp/OpenLP.qhc"
+
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) build/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in build/latex."
+	@echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
+	      "run these through (pdf)latex."
+
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) build/changes
+	@echo
+	@echo "The overview file is in build/changes."
+
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) build/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in build/linkcheck/output.txt."
+
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) build/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in build/doctest/output.txt."

=== added file 'manual/make.bat'
--- manual/make.bat	1970-01-01 00:00:00 +0000
+++ manual/make.bat	2011-06-27 13:34:22 +0000
@@ -0,0 +1,112 @@
+@ECHO OFF
+
+REM Command file for Sphinx documentation
+
+set SPHINXBUILD=sphinx-build
+set ALLSPHINXOPTS=-d build/doctrees %SPHINXOPTS% source
+if NOT "%PAPER%" == "" (
+	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
+)
+
+if "%1" == "" goto help
+
+if "%1" == "help" (
+	:help
+	echo.Please use `make ^<target^>` where ^<target^> is one of
+	echo.  html      to make standalone HTML files
+	echo.  dirhtml   to make HTML files named index.html in directories
+	echo.  pickle    to make pickle files
+	echo.  json      to make JSON files
+	echo.  htmlhelp  to make HTML files and a HTML help project
+	echo.  qthelp    to make HTML files and a qthelp project
+	echo.  latex     to make LaTeX files, you can set PAPER=a4 or PAPER=letter
+	echo.  changes   to make an overview over all changed/added/deprecated items
+	echo.  linkcheck to check all external links for integrity
+	echo.  doctest   to run all doctests embedded in the documentation if enabled
+	goto end
+)
+
+if "%1" == "clean" (
+	for /d %%i in (build\*) do rmdir /q /s %%i
+	del /q /s build\*
+	goto end
+)
+
+if "%1" == "html" (
+	%SPHINXBUILD% -b html %ALLSPHINXOPTS% build/html
+	echo.
+	echo.Build finished. The HTML pages are in build/html.
+	goto end
+)
+
+if "%1" == "dirhtml" (
+	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% build/dirhtml
+	echo.
+	echo.Build finished. The HTML pages are in build/dirhtml.
+	goto end
+)
+
+if "%1" == "pickle" (
+	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% build/pickle
+	echo.
+	echo.Build finished; now you can process the pickle files.
+	goto end
+)
+
+if "%1" == "json" (
+	%SPHINXBUILD% -b json %ALLSPHINXOPTS% build/json
+	echo.
+	echo.Build finished; now you can process the JSON files.
+	goto end
+)
+
+if "%1" == "htmlhelp" (
+	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% build/htmlhelp
+	echo.
+	echo.Build finished; now you can run HTML Help Workshop with the ^
+.hhp project file in build/htmlhelp.
+	goto end
+)
+
+if "%1" == "qthelp" (
+	%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% build/qthelp
+	echo.
+	echo.Build finished; now you can run "qcollectiongenerator" with the ^
+.qhcp project file in build/qthelp, like this:
+	echo.^> qcollectiongenerator build\qthelp\OpenLP.qhcp
+	echo.To view the help file:
+	echo.^> assistant -collectionFile build\qthelp\OpenLP.ghc
+	goto end
+)
+
+if "%1" == "latex" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% build/latex
+	echo.
+	echo.Build finished; the LaTeX files are in build/latex.
+	goto end
+)
+
+if "%1" == "changes" (
+	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% build/changes
+	echo.
+	echo.The overview file is in build/changes.
+	goto end
+)
+
+if "%1" == "linkcheck" (
+	%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% build/linkcheck
+	echo.
+	echo.Link check complete; look for any errors in the above output ^
+or in build/linkcheck/output.txt.
+	goto end
+)
+
+if "%1" == "doctest" (
+	%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% build/doctest
+	echo.
+	echo.Testing of doctests in the sources finished, look at the ^
+results in build/doctest/output.txt.
+	goto end
+)
+
+:end

=== added directory 'manual/source'
=== added directory 'manual/source/_static'
=== added directory 'manual/source/_templates'
=== added file 'manual/source/alert.rst'
--- manual/source/alert.rst	1970-01-01 00:00:00 +0000
+++ manual/source/alert.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,57 @@
+=====
+Alert
+=====
+
+From time to time it may be necessary to display a small unobtrusive message to 
+the congregation. In OpenLP this is known as an `Alert`. Examples could be a car 
+with the headlights left on, a parent needed in nursery, or anything else 
+somebody may need notified about. This is easily accomplished using the Alert, 
+which is accessible from the top Menu under :menuselection:`Tools --> Alert`.
+
+.. image:: pics/alert.png
+
+:guilabel:`Alert text:` Enter the message you want displayed in this box.
+
+:guilabel:`Parameter:` This box is used for words you want to insert into the 
+alert text.
+ 
+You will add the Parameter text into the alert text using “<>” (without 
+quotations). Anywhere in the Alert text that you add these two symbols, <> side 
+by side, will insert any text you have in the parameter box into the Alert 
+message.
+
+Examples of use
+---------------
+ 
+:guilabel:`Alert text:` The owner of the vehicle with license plate number <> 
+your lights are on.
+
+:guilabel:`Parameter:` HNN432
+
+These two settings will display like this:
+
+The owner of the vehicle with the license plate number HNN432 your lights are on.
+
+You could also reverse this example:
+
+:guilabel:`Alert text:` HNN432 <>
+
+:guilabel:`Parameter:` left their lights on.
+
+`Will display like this:` HNN432 left their lights on.
+
+If you use the same alerts on a regular basis, Save your Alert and you will have 
+access to the alert with a click of the mouse. You may also click on `New` to 
+make a new alert or `Delete` an alert you do not need.
+
+When you are ready to Display your Alert you have two options. Clicking on 
+Display will display the Alert and the Alert Message window will remain open. 
+Clicking Display & Close will display the alert and close the Alert Message 
+window. 
+
+All details of the display, font, color, size and position are adjusted from the 
+top Menu item :menuselection:`Settings --> Configure OpenLP`, Alert tab and the 
+instructions here. :doc:`configure`
+
+**Please note:** Alert Message is a Plugin that needs to be Active in the Plugin 
+List for use.
\ No newline at end of file

=== added file 'manual/source/bibles.rst'
--- manual/source/bibles.rst	1970-01-01 00:00:00 +0000
+++ manual/source/bibles.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,161 @@
+======
+Bibles
+======
+
+Managing Bibles in OpenLP is a relatively simple process. There are also
+converters provided to get data from other formats into OpenLP.
+
+.. _bibles-import:
+
+Bible Import Wizard
+===================
+
+If you are using an earlier version of OpenLP or, come from another software
+package, you may be able to convert your existing database to work in OpenLP
+2.0. To access the Bible Importer :menuselection:`File --> Import --> Bible`.
+You may also enter the Bible Importer by clicking the :guilabel:`Import Icon:`
+
+|importicon| Import Bibles
+    Click on the :guilabel:`Import Bibles` icon to start the Bible import wizard.
+
+.. |IMPORTICON| image:: pics/themeimportexport.png
+
+You will see the Bible Importer window, click :guilabel:`Next`.
+
+.. 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.
+
+.. 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.
+
+Windows XP::
+
+    C:\Documents and Settings\All Users\Application Data\openlp.org\Data\Bibles\
+
+Windows Vista / Windows 7::
+
+    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.
+
+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
+of electronic Bibles. More information can be found out at the `Bible Technologies website
+<http://www.bibletechnologies.net/>`_.
+
+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.
+
+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::
+
+    mod2osis biblename > biblename.osis
+
+For example: if I wanted to convert a King James Version Bible I would type
+something similar to this::
+
+    mod2osis KJV > kjv.osis
+
+You may also wish to dictate a file location for the conversion to place the
+osis file for example::
+
+    mod2osis KJV > /home/user/bibles/kjv.osis
+
+Importing OpenSong Bibles
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Converting from OpenSong you will need to locate your Bibles database. In the
+later versions of OpenSong you are asked to define the location of this. The
+songs will be located in a folder named :guilabel:`Bibles`. This folder should
+contain files with all your Bibles in them without a file extension. (file.xmms).
+When you have located this folder you will need to select the Bible from the
+folder.
+
+You may also import downloaded Bibles from OpenSong. The process is the same,
+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.
+
+Importing Web Download Bibles
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+**About Web Download**
+
+OpenLP provides a Web Download method to import Bibles when you do not have a
+locally installed Bible available. The Web Download method registers the Bible
+in OpenLP like the other Bibles only it downloads the verses as you need them.
+This import is not meant to be used as your sole source for Bibles, but rather
+as another option and does require an internet connection.
+
+To use the web download feature select web download from the import wizard.
+
+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.
+
+.. image:: pics/webbible1.png
+
+You can also select a proxy server if needed from the `Proxy Server` tab. Your
+network administrator will know if this is necessary, in most cases this will
+not be needed.
+
+.. 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.
+
+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.
+
+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.

=== added file 'manual/source/conf.py'
--- manual/source/conf.py	1970-01-01 00:00:00 +0000
+++ manual/source/conf.py	2011-06-27 13:34:22 +0000
@@ -0,0 +1,228 @@
+# -*- coding: utf-8 -*-
+#
+# OpenLP documentation build configuration file, created by
+# sphinx-quickstart on Thu Sep 30 21:24:54 2010.
+#
+# This file is execfile()d with the current directory set to its containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys
+import os
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#sys.path.insert(0, os.path.abspath('.'))
+
+# -- General configuration -----------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be extensions
+# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+extensions = []
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix of source filenames.
+source_suffix = '.rst'
+
+# The encoding of source files.
+#source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'OpenLP'
+copyright = u'2004 - 2011, Raoul Snyman'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '2.0'
+# The full version, including alpha/beta/rc tags.
+release = '2.0'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = ['_build']
+
+# The reST default role (used for this markup: `text`) to use for all documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+
+# -- Options for HTML output ---------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+if sys.argv[2] == 'qthelp' or sys.argv[2] == 'htmlhelp':
+    html_theme = 'openlp_qthelp'
+else:
+    html_theme = 'default'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+if sys.argv[2] == 'html':
+    html_theme_options = {
+        'sidebarbgcolor': '#3a60a9',
+        'relbarbgcolor': '#203b6f',
+        'footerbgcolor': '#26437c',
+        'headtextcolor': '#203b6f',
+        'linkcolor': '#26437c',
+        'sidebarlinkcolor': '#ceceff'
+    }
+
+# Add any paths that contain custom themes here, relative to this directory.
+html_theme_path = [os.path.join(os.path.abspath('..'), 'themes')]
+
+# The name for this set of Sphinx documents.  If None, it defaults to
+# "<project> v<release> documentation".
+html_title = u'OpenLP 2.0 Reference Manual'
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+html_logo = 'pics/logo.png'
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+html_favicon = 'pics/openlp.ico'
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_domain_indices = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'OpenLP'
+
+
+# -- Options for LaTeX output --------------------------------------------------
+
+# The paper size ('letter' or 'a4').
+#latex_paper_size = 'letter'
+
+# The font size ('10pt', '11pt' or '12pt').
+#latex_font_size = '10pt'
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title, author, documentclass [howto/manual]).
+latex_documents = [
+  ('index', 'OpenLP.tex', u'OpenLP Reference Manual',
+   u'Wesley Stout', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# If true, show page references after internal links.
+#latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#latex_show_urls = False
+
+# Additional stuff for the LaTeX preamble.
+#latex_preamble = ''
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_domain_indices = True
+
+
+# -- Options for manual page output --------------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    ('index', 'openlp', u'OpenLP Reference Manual',
+     [u'Wesley Stout'], 1)
+]

=== added file 'manual/source/configure.rst'
--- manual/source/configure.rst	1970-01-01 00:00:00 +0000
+++ manual/source/configure.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,370 @@
+==================
+Configuring OpenLP
+==================
+
+OpenLP has many options you can configure to suit your needs. Most options are
+self-explanatory and we will quickly review them.
+
+To configure OpenLP, click on :menuselection:`Settings --> Configure OpenLP...`
+
+The plugins you have activated will have configure options. If all the plugins
+are activated there will be 10 items down the left side you can configure.
+
+General Tab
+===========
+
+.. image:: pics/configuregeneral.png
+
+Monitors
+^^^^^^^^
+To select the monitor you want to display OpenLP on, click the drop-down box 
+and choose. 
+
+Display if a single screen
+^^^^^^^^^^^^^^^^^^^^^^^^^^ 
+
+When this box is selected, you will be able to see your display on a separate 
+window on the monitor you are using. Click the display and push the Esc key
+on your keyboard to close the display window.
+	
+Application Startup
+^^^^^^^^^^^^^^^^^^^
+
+*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:*
+  When this box is selected, OpenLP will remember the last service you were 
+  working on when you closed the program.
+
+*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.
+
+Application Settings
+^^^^^^^^^^^^^^^^^^^^
+
+*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*
+  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
+  images, verses, or lyrics. This control timer is also accessible on the "live 
+  toolbar.
+
+CCLI Details
+^^^^^^^^^^^^
+
+*CCLI number*
+  If you subscribe to CCLI, this box is for your License number. This number is
+  also displayed in the Song Footer box.
+
+Display Position
+^^^^^^^^^^^^^^^^
+This setting will default to your computer monitor. It will override the output 
+display combo box.  If your projector display is different, select the Override 
+display position and make the changes here to match your projector display. This 
+option also comes in handy when you have the "Display if a single screen" box 
+selected. You can make the display smaller so it does not cover your whole 
+screen.
+
+Themes Tab
+==========
+
+.. image:: pics/configurethemes.png
+
+Global Theme
+^^^^^^^^^^^^
+ 
+Choose the theme you would like to use as your default global theme from the
+drop down box. The theme selected appears below. The global theme use is
+determined by the Theme Level you have selected.
+	
+Theme Level
+^^^^^^^^^^^
+
+Choose from one of three options for the default use of your theme.
+
+*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:*
+  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:*
+  With this level selected, all songs and verses will use the theme selected on
+  the left in the Global Theme drop down.
+
+Advanced Tab
+============
+
+.. image:: pics/configureadvanced.png
+
+
+UI Settings (user interface)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+*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:*
+  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:*
+  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:*
+  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
+  Manager.
+
+Songs Tab
+=========
+
+.. image:: pics/configuresongs.png
+
+Songs Mode
+^^^^^^^^^^
+
+*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:*
+  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:*
+  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:*
+  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 
+  checked, the song is available in the service but will not be added to the 
+  Media Manager.
+
+Bibles Tab
+==========
+
+.. image:: pics/configurebibles.png
+
+Verse Display
+^^^^^^^^^^^^^
+
+*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:*
+  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:*
+  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.
+
+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:*
+  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.
+
+
+Presentations Tab
+=================
+
+.. image:: pics/configurepresentations.png
+
+Available Controllers
+^^^^^^^^^^^^^^^^^^^^^
+
+OpenLP has the ability to import OpenOffice Impress or Microsoft PowerPoint
+presentations, and use Impress, PowerPoint, or PowerPoint Viewer to display
+them and they are controlled from within OpenLP. Please remember that in order
+to use this function, you must have Impress, PowerPoint or PowerPoint Viewer
+installed on your computer because OpenLP uses these programs to open and run
+the presentation. You may select your default controllers here in this tab. 
+
+Advanced
+^^^^^^^^
+
+*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.
+
+Media Tab
+=========
+
+.. image:: pics/configuremedia.png
+
+Media Display
+^^^^^^^^^^^^^
+
+*Use Phonon for video playback*
+  If you are having trouble displaying media, selecting this box could help.
+
+Custom Tab:
+===========
+
+.. image:: pics/configurecustom.png
+
+Custom Display
+^^^^^^^^^^^^^^
+
+*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.
+
+Alerts Tab
+==========
+
+.. image:: pics/configurealerts.png
+
+Font
+^^^^
+
+*Font name:*
+  Choose your desired font from the drop down menu
+
+*Font color:*
+  Choose your font color here.
+
+*Background color:*
+  Choose the background color the font will be displayed on.
+
+*Font size:*
+  This will adjust the size of the font.
+
+*Alert timeout:*
+  This setting will determine how long your Alert will be displayed on the screen,
+  in seconds.
+
+*Location:*
+  Choose the location where you want the alert displayed on the
+  screen, Top, Middle or Bottom.
+
+*Preview:*
+  Your choices will be displayed here.
+
+Remote Tab
+===========
+
+OpenLP gives you the ability to control your Service Manager or send an Alert 
+from a remote computer through a web browser. This could be useful for a nursery 
+or daycare to display an Alert message or use it as an interface to control the 
+whole service remotely. This will work in any web browser that has network access 
+whether it is another computer, a netbook or a smartphone.
+
+An example of use for this would be if you have a missionary with a 
+PowerPoint presentation, it may be easier for that missionary to remotely 
+connect to your projection computer and change the slides when they want to.
+
+To use this feature your computers will need to be on the same network, wired or 
+wireless.
+
+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:*
+  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:*
+  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.
+
+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:*
+  
+Open *Command Prompt* and type::
+  
+  C:\Documents and Settings\user>ipconfig
+ 
+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:*
+
+Open *Terminal* and type::
+
+  linux@user:~$ifconfig 
+
+Press the :kbd:`Enter` key. This will display a fair amount of technical 
+information about your network cards. On most computers, the network card is 
+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*
+  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:".
+
+With these two settings written down, open a web browser in the remote computer
+and enter the IP address followed by a colon and then the port number, ie: 
+192.168.1.104:4316  then press enter. You should now have access to the OpenLP
+Controller. If it does not come up, you either entered the wrong IP address, 
+port number or one or both computers are not connected to the network.

=== added file 'manual/source/creating_service.rst'
--- manual/source/creating_service.rst	1970-01-01 00:00:00 +0000
+++ manual/source/creating_service.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,224 @@
+==================
+Creating a service
+==================
+
+Now that you have OpenLP set up the way you want, it is time to put it to use.
+
+Everything you need to display will be in the left panel called the
+:ref:`g-media-manager`, under their respective categories. Using the
+:ref:`g-media-manager` you can add new media, songs, images, Bibles or create a
+custom slide as discussed earlier in the :ref:`media-manager` section.
+
+.. image:: pics/mediamanager_songs.png
+
+On the right side of your screen at the top is the Service Manager.
+
+.. image:: pics/service_manager.png
+
+Anything you want to display should be in the Service Manager and preferably in
+the order you want to display it. To add your media you can click on an item in
+the *Media Manager* hold and drag your selection from the Media Manager over to
+the *Service Manager* or, after clicking the media or verse you want to use,
+click the + sign icon above. This will add your media to the service side at the
+bottom. Once it is in the Service Manager you can click on your item and drag
+and drop it in the order you want or, click the item and use the arrow icons
+below to move it up or down in the order you want. Note: You always have the
+option to send any media live direct from the Media Manager. Please see the
+:ref:`media-manager` section for more details.
+
+.. image:: pics/service_arrows.png
+
+Displaying an Item
+------------------
+
+When you have all of your items needed for the service in your Service Manager
+there are a few ways to get them to display on the screen. You can double-click
+the item, click it once with the mouse and push the :kbd:`Enter` key on your
+keyboard, right click the item and left click *Show Live* or click it once with
+the mouse and click on the projector at the bottom of the Service Manager.
+
+.. image:: pics/service_send_live.png
+
+Any of these methods will display your item on
+the screen. When your item is displayed, it will appear in the Live windows just
+to the left of the Service Manager.
+
+.. image:: pics/service_live.png
+
+To Preview an item in the left *Preview* panes, right click the item and left
+click *Show Preview*.
+
+Changing a Service theme
+------------------------
+
+When you get your Service file set up and you are previewing a slide or sending
+it Live and you notice you don't have the correct theme for it, you can right
+click the item and mouseover :guilabel:`Change Item Theme` and select the theme
+you want to use.
+
+Moving through a Service
+------------------------
+
+Once you have your first item displayed live you can move through the service in
+a couple of ways. You can double-click on each item you need displayed, or click
+it once and press enter. If your songs, verses, etc. are in the order you will
+be displaying them, you can use the :kbd:`Right Arrow` key on your keyboard to
+move down through your service. Pressing the :kbd:`Left Arrow` key will move up
+through the service. Every time you press the :kbd:`Left Arrow` or
+:kbd:`Right Arrow` key the next item in your Service will be displayed.
+
+Moving through a Song or Bible verses
+-------------------------------------
+
+When you display a song or Bible verse with multiple verses you will need to
+move through them. When a song or verse is being displayed you will see the
+lyrics in the top Live window and how it actually appears on your display
+in the bottom Live window. To change slides you can use your mouse to click on
+each slide in the top Live window, use the Left Arrow and Right Arrow icons
+under the top Live window.
+
+.. image:: pics/service_live_arrows.png
+
+You can also use the :kbd:`Down Arrow` key to move down through
+the song or verses. Using the :kbd:`Up Arrow` key will move you from bottom to
+top. :kbd:`Page Up` and :kbd:`Page Down` keys will do the same thing.
+
+Adding a group of Images
+------------------------
+
+At some point you may have a group of images to display together. It may be
+pictures from a youth group adventure, bulletin announcements, or some other
+reason. Once you add your images to the Media Manager hold the :kbd:`Ctrl` key
+on your keyboard and click each image you want to add as a group. As you click
+the images they will remain highlighted. When you are done with your selections
+you can either click the + icon above the images or, click on one of the
+highlighted images, hold the mouse button and drag them over to the Service
+Manager side and place them where you need them.
+
+.. image:: pics/service_images.png
+
+Sorting a group of Images
+-------------------------
+
+If you do not like the order the images are in,
+right click Images.
+
+.. image:: pics/service_reorder.png
+
+Left click Reorder Item.
+
+.. image:: pics/service_reorder_service_item.png
+
+From this box you will be able to rearrange the order of your images by clicking
+on one and using the :guilabel:`Up` and :guilabel:`Down` arrows to move it to
+where you want it. If there is an image you do not want in your order, click on
+it and then click the :guilabel:`Delete` button. When you are done arranging
+your images click :guilabel:`Save`.
+
+If you need to add another image from the Media Manager to your group of images,
+left click the image you want to add and hold the mouse button and drag it over
+your group of Images and release the mouse button. You will be given two options,
+:guilabel:`Add New Item` and :guilabel:`Add to Selected Item`.
+
+.. image:: pics/service_add.png
+
+If you click :guilabel:`Add New Item` your image will be separate from your
+group of images as another item at the bottom of the Service. If you click
+:guilabel:`Add to Selected Item` your image will be added to your group of
+images.
+
+Adding a service Note
+---------------------
+
+You have the option to leave yourself or the next tech a service note. This is
+done by right clicking on an item in your service and left clicking *Notes*.
+
+.. image:: pics/service_item_notes.png
+
+You can type your note in the box and click :guilabel:`Save`. If you change your
+mind you can click :guilabel:`Cancel`. Your note will appear as a yellow note on
+your item.
+
+.. image:: pics/service_note.png
+
+If you need to change your Note or delete it, open it again, delete your text
+and click :guilabel:`Save`
+
+Using the Service Timer
+-------------------------------
+
+The Service Timer is available for any media item with multiple slides.
+This includes Bible verses, Songs, or a group of images. The Service Timer is 
+accessed in the *Live Controller Bar* between the Live panes.
+
+.. image:: pics/service_timer.png
+
+The time delay increment is in seconds. Use the up or down arrow on the right of 
+the timer to change the number of seconds or type in the number of seconds you 
+want to use. This number determines how many seconds will lapse before your 
+media item will automatically change to the next slide. 
+
+Immediately to the left of the second counter is a down arrow. Clicking on this 
+arrow will give you two options for the use of the timer.
+
+.. image:: pics/service_timer_select.png
+
+**Play Slides in Loop**
+    Selecting this option will continuously loop your slides from beginning to 
+    end, and back to the beginning again. The slide loop will continue until you 
+    click the timer start and stop button again or move to the next service item.
+
+**Play Slides to End**
+    Selecting this option will display your slides through once and stop at the 
+    end.
+
+|service_timer| **Timer start and stop**
+    Click this button to start or stop the timer function. You can also use the 
+    keyboard shortcut :kbd:`L` to start and stop the continuous loop.
+
+Using the "Blank to" Control
+----------------------------
+
+On the *Live Controller Bar* in between the Live windows are three options to
+Blank your screen. Clicking on the down arrow next to the blank button will show
+you your three options.
+
+.. image:: pics/service_blank.png
+
+**Blank Screen**
+    Choosing this option will blank your projector to black as if it were shut off.
+    The shortcut for this option is :kbd:`.` (fullstop/period on your keyboard).
+
+**Blank to Theme**
+    Choosing this option will show your blank theme only, without lyrics or verses.
+    If you are blanking a song with an assigned theme it will blank to that theme.
+    If no theme is assigned or you are blanking a presentation or image, it will
+    blank to the global theme. The shortcut for this option is :kbd:`T`.
+
+**Blank to Desktop**
+    Choosing this option will show your desktop wallpaper or a program that you have
+    open on the extended monitor or projector. You can seamlessly switch between one
+    program and OpenLP by Blank to Desktop. The shortcut for this option is :kbd:`D`.
+
+You can change or add to the keyboard shortcuts here
+:menuselection:`Settings --> Configure Shortcuts`.
+
+New, Open and Saving the service
+---------------------------------
+
+.. image:: pics/service_save.png
+
+These three icons at the top of the *Service Manager* will do the following:
+The first icon will create a New Service. The second icon will Open an already
+created service file. The third icon will Save the service you created, added to
+or rearranged.
+
+Now that you created your service, tested it and are ready for your worship
+service, you will want to save your service file. OpenLP will remind you to do
+this when you close the program or you can click the save button at the top of
+your service file. Choose the location you want to save your file and click
+:guilabel:`Ok`.
+
+.. These are all the image templates that are used in this page.
+
+.. |SERVICE_TIMER| image:: pics/service_timer_start.png
\ No newline at end of file

=== added file 'manual/source/custom_slides.rst'
--- manual/source/custom_slides.rst	1970-01-01 00:00:00 +0000
+++ manual/source/custom_slides.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,27 @@
+.. _custom-slides:
+
+Custom Slides
+=============
+
+Adding a new custom slide displays the following dialog:
+
+.. image:: pics/mediamanager_custom_edit.png
+
+**Title**
+    Name of your custom slide.
+
+**Add**
+    After clicking on Add you will enter your text you want to display in this
+    box. To create multiple slides, click the Split Slide button. When you have
+    finished adding your text, click on the Save button.
+
+**Theme**
+  Select the theme you want to use for your Custom slide from this drop down box.
+
+**Credits**
+  Anything typed in this box will be displayed in the footer information on the
+  display. When you are finished, click the :guilabel:`Save` button.
+
+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.

=== added file 'manual/source/display_tags.rst'
--- manual/source/display_tags.rst	1970-01-01 00:00:00 +0000
+++ manual/source/display_tags.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,71 @@
+.. _display-tags:
+
+============
+Display 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 
+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
+tag consists of brace, tag identifier, brace. 
+
+Using a display tag
+-------------------
+
+To use :ref:`g-display-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 italicize a section of text you would do the following in a custom slide or
+song::
+
+  Amazing grace how {it} sweet {/it} the sound.
+  
+This will yield the text as:
+
+  Amazing grace how *sweet* the sound.
+  
+Included display tags
+---------------------
+
+The following tags are included with OpenLP
+
+* **{r}** red text
+* **{b}** black text
+* **{bl}** blue text
+* **{y}** yellow text
+* **{g}** green text
+* **{pk}** pink text
+* **{o}** orange text
+* **{pp}** purple text
+* **{w}** white text
+* **{sb}** subscript text
+* **{p}** paragraph
+* **{st}** bold
+* **{it}** italics
+
+Configuring display tags
+------------------------
+
+To add new :ref:`g-display-tags` go to :menuselection:`Settings -> Configure 
+Display Tags`
+
+.. image:: pics/configure_display_tags.png
+
+Click the :guilabel:`New` button to add new :ref:`g-display-tags`. Enter the 
+description of the display tag followed by the tag. The tag must be 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`.
+
+To delete :ref:`g-display-tags` that you have entered click on the display tag
+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
+be manually deleted from the songs or custom slides.

=== added file 'manual/source/dualmonitors.rst'
--- manual/source/dualmonitors.rst	1970-01-01 00:00:00 +0000
+++ manual/source/dualmonitors.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,258 @@
+.. _dualmonitors:
+
+==================
+Dual Monitor Setup
+==================
+
+The first step in getting OpenLP working on your system is to setup your
+computer properly for dual monitors. This is not very difficult, but the steps
+will vary depending on operating system.
+
+Most modern computers have the ability for dual monitors. To be certain,
+check your computer's documentation. A typical desktop computer capable of dual
+monitors will have two of, or a combination of the two, connectors below.
+
+**VGA**
+
+.. image:: pics/vga.png
+
+**DVI**
+
+.. image:: pics/dvi.png
+
+**HDMI**
+
+.. image:: pics/hdmi.png
+
+**S-Video**
+
+.. image:: pics/svideo.png
+
+A laptop computer setup varies slightly. Generally you will need only one of 
+the outputs pictured above since your laptop screen serves as one of the
+monitors. Some older laptops may require a key stroke generally involving the
+:kbd:`Fn` key and another key (labeled on the keybaord) to enable the second
+monitor.
+
+A typical OpenLP setup consist of your normal single monitor, with your
+projector hooked up to your computer as the second monitor. With the option of 
+extending your desktop across the second monitor, or your operating system's 
+equivalent.
+
+**Special Note For Projectors Using USB Connections**
+
+Users have reported experiencing difficulties when using a projector with a USB
+connection. Third party software is often required to properly configure
+dual monitors. If possible, it is best to use a direct output (VGA, DVI, HDMI,
+S-Video) from your machine's video card. If a USB connection is your only option
+please consult the manufacturer's manual for instructions on a proper setup.
+
+Microsoft Windows
+-----------------
+
+Dual monitor setup is similar among all the currently supported Windows
+releases (:ref:`win7monitor`, :ref:`winvistamonitor`, :ref:`winxpmonitor`), but 
+does vary slightly from one release to the next.
+
+.. _win7monitor:
+
+Windows 7
+^^^^^^^^^
+
+Windows 7 has using  a projector in mind. Simply connect your projector and
+press :kbd:`Windows+P`.
+
+The more traditional way is also fairly straight forward. Go to
+:guilabel:`Control Panel` and click on :guilabel:`Display`. This will open up
+the :guilabel:`Display` dialog. You may also bypass this step by a right click 
+on a blank area on your desktop and selecting :guilabel:`Resolution`.
+
+.. image:: pics/winsevendisplay.png
+
+Then click on the :guilabel:`Adjust resolution` link in the left pane. Enable
+your projector and make sure that the selected value for :guilabel:`Multiple
+displays` is :guilabel:`Extend these displays`.
+
+.. image:: pics/winsevenresolution.png
+
+.. _winvistamonitor:
+
+Windows Vista
+^^^^^^^^^^^^^
+
+From :guilabel:`Control Panel` click on :guilabel:`Personalize`, or right click
+a blank place on the desktop and click :guilabel:`Personalization`.
+
+.. image:: pics/vistapersonalize.png
+
+From the :guilabel:`Personalization` window click on :guilabel:`Display
+Settings`. Click on the monitor that represents your projector and make sure
+you have checked :guilabel:`Extend the desktop onto this monitor`.
+
+.. image:: pics/vistadisplaysettings.png
+
+.. _winxpmonitor:
+
+Windows XP
+^^^^^^^^^^
+
+From :guilabel:`Control Panel` select :guilabel:`Display`, or right click on a
+blank area of the desktop and select :guilabel:`Properties`. From the
+:guilabel:`Display Properties` window click on the :guilabel:`Settings` tab.
+Click on the monitor that represents your projector and make sure you have
+checked :guilabel:`Extend my Windows desktop onto this monitor`.
+
+.. image:: pics/xpdisplaysettings.png
+
+Linux
+-----
+
+Due to the vast varieties of hardware, distributions, desktops, and drivers
+this is not an exhaustive guide to dual monitor setup on Linux. This guide
+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 2
+^^^^^^^
+
+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
+^^^
+
+This guide is for users of the KDE desktop who do not use proprietary drivers.
+From most distros click the Kick Off menu and navigate to
+:guilabel:`System Settings`
+
+.. image:: pics/kdesystemsettings.png
+
+Click on the display and monitor icon.
+
+.. image:: pics/kdedisplay.png
+
+From here you will need to set up your projector with the appropriate
+resolution, and position. OpenLP works best projecting to the monitor on the
+right.
+
+Linux Systems Using nVidia Drivers
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This guide is for users of the proprietary nVidia driver on Linux Distributions.
+It is assumed that you have properly setup your drivers according to your
+distribution's documentation, and you have a working ``xorg.conf`` file in 
+place.
+
+If you wish to make the changes permanent in setting up your system for dual
+monitors it will be necessary to modify your ``xorg.conf`` file. It is always a
+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
+
+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
+
+The exact location of the ``xorg.conf`` file can vary so check your
+distribution's documentation.
+
+If you want to make your changes permanent run nVidia settings from the
+terminal::
+
+  user@linux:~ $ sudo nvidia-settings
+
+Or, as root::
+
+  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
+menu, usually in an administration or system menu, or from the terminal as a
+normal user run::
+
+ user@linux:~ $ nvidia-settings
+
+Once you have opened nVidia Settings, click on :guilabel:`X Server Display
+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` 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 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`.
+
+.. image:: pics/xorgwrite.png
+
+Click :guilabel:`Save` and you should be set. You may want to restart X or
+your machine just to make sure all the settings carry over the next time you log
+in.
+
+Linux Systems With Intel Video
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Generally systems with Intel video cards work very well. They are well supported
+by open source drivers. There are, however, a couple of issues that may require
+some work arounds.
+
+**Resolution Issue**
+
+There is a limitation with certain cards which limits the total resolution to
+2048x2048, so both monitors can not have a total resolution totaling more than
+that. To work around this it may be necessary to position your monitor as a top
+or bottom monitor as opposed to the typical side by side setup. This can easily
+be accomplished through your desktop's control of monitors. Please see the 
+sections on dual monitors with KDE and GNOME above.
+
+**Primary Monitor Issues**
+
+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
+name of your monitor. If you are a KDE user this info is given to you in the 
+display settings. If you are not using KDE enter the following in a terminal
+without your projector connected to your computer::
+
+  user@linux:~ $ xrandr -q
+  
+This will give you a long string of output. Screen names will be something along 
+the lines of LVDM, VGA-0 or some convention similar to that. Without your
+projector connected to your computer only one monitor will show as being
+connected. That will be the monitor you will need to use as the primary. Now
+connect your projector and enter::
+
+  user@linux:~ $ xrandr --output LVDM --primary
+
+**Note** it has been reported that when this issue is occurring you will not 
+want to connect your projector until your desktop is running. 

=== added file 'manual/source/faq.rst'
--- manual/source/faq.rst	1970-01-01 00:00:00 +0000
+++ manual/source/faq.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,535 @@
+==========================
+Frequently Asked Questions
+==========================
+
+General Questions
+=================
+
+Can I help with OpenLP?
+-----------------------
+
+OpenLP is possible because of the commitment of individuals. If you would like 
+to help there are several things that you can get involved with. Please see: 
+`Contributing <http://openlp.org/en/documentation/introduction/contributing.html>`_ 
+for more information.
+
+I use and like OpenLP and would like to tell others online. Where can I do this?
+--------------------------------------------------------------------------------
+
+A variety of places!
+
+* Are you on facebook? Then `become a fan <http://www.facebook.com/openlp>`_
+* Are you on twitter? Then `follow openlp <http://twitter.com/openlp>`_, and
+  retweet the announcements.
+* Give us a thumbs up on the
+  `SourceForge project page <http://www.sourceforge.net/projects/openlp>`_ 
+* If you have a website or blog, then link to our site http://www.openlp.org
+  with a few words saying what the software is and why you like it.
+* Add a placemark on our `Worldwide Usage map <http://maps.google.com/maps/ms?ie=UTF8&source=embed&msa=0&msid=113314234297482809599.00047e88b1985e07ad495&ll=13.923404,0&spn=155.179835,316.054688&z=2>`_,
+  so others in your locality can see someone close by is using it.
+* If you are a member of any Christian Forums or websites, and their rules allow
+  it, then perhaps review the software or ask others to review it.
+
+What operating systems will OpenLP 2.0 support?
+-----------------------------------------------
+
+OpenLP 2.0 is designed to be cross platform. Currently it has been known to run 
+on Windows (XP, Vista, 7), Linux (Ubuntu/Kubuntu, Fedora), FreeBSD & Mac OSX. 
+`Please let us know <http://wiki.openlp.org/Help:Contents>`_ if you've 
+successfully run it on something else.
+
+Which programming language is 2.0 developed in?
+-----------------------------------------------
+
+OpenLP 2.0 is written in `Python <http://www.python.org>`_ and uses the 
+`Qt4 toolkit <http://qt.nokia.com>`_. Both are cross-platform which allows the 
+software to run on different types of machine and so allow more people access to 
+free worship software. Python is one of the easier programming languages to 
+learn, so this helps us develop and `find bugs <http://wiki.openlp.org/Bug#Something_has_gone_wrong.2C_what_should_I_do_to_help_get_it_fixed.3F>`_ 
+quicker, and also allows more developers to contribute with the project.
+
+Which written languages does OpenLP support?
+--------------------------------------------
+
+The beta now has support for a few languages which can be seen on the 
+:menuselection:`Settings -->Translate` menu. However some of these translations 
+are incomplete. If you would like to help complete or start to translate OpenLP 
+into your language then see the `Getting started page <http://wiki.openlp.org/Translation:Getting_Started>`_. 
+
+What is a beta release?
+-----------------------
+
+A beta release is a release which is almost feature complete and is fairly 
+stable. However there may still be a few `features <http://wiki.openlp.org/Version_2_Features>`_ 
+to complete, and `bugs <https://bugs.launchpad.net/openlp>`_ we've not yet fixed. 
+It is used by several people without serious problems. However there is a small 
+possibility that it could still crash occasionally or do unexpected things. It 
+is intended for those who want the latest version, and are prepared to give the 
+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>`_.
+
+Upgrading
+=========
+
+Does 2.0 replace 1.2, or can they be run side by side?
+------------------------------------------------------
+
+It is perfectly safe to install 2.0 on a system with 1.2. Both versions are 
+installed in separate places, so you can still go back to 1.2. You can even run 
+them at the same time!
+
+2.0 stores its data in a separate folder to 1.2, so your data is perfectly safe, 
+and whatever you do in 2.0 will not damage 1.2
+
+Are 1.2 and 2.0 compatible?
+---------------------------
+
+No. However imports exist to transfer your data to the new version.
+
+I have a computer that is quite old, should I upgrade?
+------------------------------------------------------
+
+2.0 does require significantly more resources than v1.2. Therefore if your 
+computer does not have much memory you may find 2.0 will struggle, `especially` 
+when changing between slides.
+
+Why can I not see my 1.2 songs, bibles and themes in 2.0?
+---------------------------------------------------------
+
+This is an beta release, which means it is not finished and one of the things we 
+haven't completely finished yet is importing 1.2 data automatically. We plan to 
+do this `Version 1.9.6 (beta 2) <http://wiki.openlp.org/Version_2_Milestones#Version_1.9.6_.28beta_2.29>`_.
+
+How do I transfer my 1.2 song database?
+---------------------------------------
+
+In OpenLP 2.0, go to the :menuselection:`File --> Import --> Song` menu.
+In the Wizard that appears, click Next and choose "openlp.org v1.x" from the 
+Format list. Click the search button on the Filename prompt, and at the bottom 
+of the dialog, copy the following into the File name prompt::
+
+    %ALLUSERSPROFILE%\Application Data\openlp.org\Data\songs.olp
+
+*(This must be in the popup file chooser dialog. Don't enter it directly into 
+the wizard).*
+
+Click Open, then in the wizard just click Next and wait for the import to complete.
+
+How do I transfer my 1.2 Bibles?
+--------------------------------
+
+In OpenLP 2.0, go to the :menuselection:`File --> Import --> Bible` menu.
+In the Wizard that appears, click Next and choose "openlp.org v1.x" from the 
+Format list.
+Click the search button on the Filename prompt, and at the bottom of the dialog, 
+copy the following into the File name prompt::
+
+    %ALLUSERSPROFILE%\Application Data\openlp.org\Data\Bibles
+
+*(This must be in the popup file chooser dialog. Don't enter it directly into 
+the wizard).*
+
+Choose the Bible, Click Open, then in the wizard just click Next, enter the 
+License details, and wait for the import to complete.
+
+How do I transfer my 1.2 Themes?
+--------------------------------
+
+In openlp.org v1, export each theme by selecting it in the Theme Manager, and 
+then clicking the picture of a blue folder with red arrow on the Theme Managers 
+toolbox. This theme file can then be imported into V2 using the 
+:menuselection:`File --> Import --> Theme` menu.
+
+I can't get my 2.0 theme to look the same as 1.2
+------------------------------------------------
+
+OpenLP 2.0 is a complete rewrite using a completely different programming 
+language so it would work on different types of system. There are differences in 
+how the old and new languages draw text on the screen, and therefore it is 
+unlikely you'll get an exact match.
+
+Using OpenLP
+============
+
+I've started OpenLP, but I can't see the songs or bibles section in the Media Manager
+-------------------------------------------------------------------------------------
+
+When you installed OpenLP, the first time wizard would have asked which plugins 
+you wanted, and songs and bibles should have been selected. If for some reason 
+they were not, then you will need to activate them yourself. See 
+`How do I activate / deactivate a plugin <http://wiki.openlp.org/Bug#How_do_I_activate_.2F_deactivate_a_plugin.3F>`_ 
+for instructions.
+
+How do I activate / deactivate a plugin?
+----------------------------------------
+
+Plugins can be turned on and off from the Plugin List Screen. Select the plugin 
+you wish to start/stop and change it's status. You should not need to restart 
+OpenLP.
+
+What are these plugins that I keep seeing mentioned?
+----------------------------------------------------
+
+The plugins allow OpenLP to be extend easily.  A number have been written 
+(Songs, Bibles, Presentations) etc but it is possible for the application to be 
+extended with functionality only you require.  If this is the case then go for 
+it but lets us know as we can help and it may be something someone else wants.
+
+How do I enable PowerPoint/Impress/PowerPoint Viewer?
+-----------------------------------------------------
+
+First of all ensure that the presentation plugin is enabled (see above).
+Then to enable a presentation application, go to the `Settings` dialog, switch 
+to the `Presentations` tab and check one of the enabled checkboxes. OpenLP will 
+automatically detect which of the three you have installed, and enable the 
+appropriate checkbox(es). Check the applications you require, and then restart 
+OpenLP for the change to be detected. 
+Note, PowerPoint Viewer 2010 is not yet supported, use 2003 or 2007.
+
+See also `I'm on Windows and PowerPoint is installed, but it doesn't appear as an option <http://wiki.openlp.org/OpenLP_2_Introduction_and_FAQ#I.27m_on_Windows_and_PowerPoint_is_installed.2C_but_it_doesn.27t_appear_as_an_option>`_
+and `Why is there no presentations plugin available on OS X? <http://wiki.openlp.org/OpenLP_2_Introduction_and_FAQ#Why_is_there_no_presentations_plugin_available_on_OS_X.3F>`_
+
+Why is there no presentations plugin available on OS X?
+-------------------------------------------------------
+
+Currently the presentations plugin is not bundled with OpenLP on OS X. The 
+reason for that is that the OpenOffice.org version on Mac OS X does not contain 
+the (more exact: does only contain a broken) interoperability component (the so 
+called pyuno bridge) which could be used by OpenLP. As soon as the 
+interoperability component works on OS X we can re-enable the plugin and bundle 
+it. We are really sorry for that.
+
+Is it possible to get Bible x? How?
+-----------------------------------
+
+The Bible plugin has a much improved `Import Wizard` which can import Bibles 
+from a variety of sources. The following sources are supported:
+
+CSV
+    The same format as documented for `openlp.org 1.x <http://www.openlp.org/en/documentation/importing_exporting_data/bibles/importing_comma_delimited_files.html>`_.
+
+OSIS
+    An XML format for Bible. You can export Bibles from the `Sword Project <http://www.crosswire.org/sword/software/>`_
+    into OSIS using the ``mod2osis`` tool. After using the Sword software Media
+    Manager (or other Sword frontend, like BibleTime or Xiphos) to download the
+    required Bible, run the following command from the command line (works on
+    Windows and Linux)::
+
+        mod2osis <name> > <name>.osis
+
+    The ``<name>`` parameter is the name of your Bible, as you see it in Sword.
+    Note that the ``<name>`` is case sensitive on all environments. Once you
+    have exported your Bible to OSIS, the Bible import wizard will the read
+    ``<name>.osis`` file and import your Bible.
+
+OpenSong
+    OpenSong has a good selection of Bibles on their
+    `download page <http://www.opensong.org/d/downloads#bible_translations>`_.
+
+Web Download
+    OpenLP can download Bibles on demand from the following 3 sites:
+
+    * `Crosswalk <http://biblestudy.crosswalk.com/bibles/>`_
+    * `BibleGateway <http://www.biblegateway.com/versions/>`_
+    * `BibleServer <http://www.bibleserver.com>`_
+
+Why do my Bible verses take a long time to load?
+------------------------------------------------
+
+In order to better conform to copyright law, the Web Download Bibles are not 
+downloaded when you import them, but on the fly as you search for them. As a 
+result, the search takes a little longer if you need to download those 
+particular verses. Having said that, the Web Download Bibles cache downloaded 
+verses so that you don't need to download them again.
+
+My Bible is on the Web Download sites, but my Church isn't on the internet. What options do I have?
+---------------------------------------------------------------------------------------------------
+
+When you create and save a service, all the items in the service are saved with 
+it. That means any images, presentations, songs and media items are saved. This 
+is also true for bibles. What this means is you can create the service on your 
+home computer, insert a Bible passage from the web, save it and then open the 
+service using your church computer and voila, the Bible passage should be there! 
+Note this can also be done with songs, etc!
+
+(Advanced) Where do I find the configuration file?
+==================================================
+
+Linux, FreeBSD & PC-BSD
+-----------------------
+
+If your distribution supports the XDG standard, you'll find OpenLP's 
+configuration file in::
+
+    /home/<user>/.config/OpenLP/OpenLP.conf
+
+If that file and/or directory does not exist, look for::
+
+    /home/<user>/.openlp/openlp.conf
+
+``<user>`` is your username.
+
+OS X
+----
+
+You'll find your configuration file here::
+
+    /Users/<user>/Library/Preferences/org.openlp.OpenLP.plist
+
+``<user>`` is your username.
+
+Windows
+-------
+
+On Windows, OpenLP does not use a configuration file, it uses the Windows 
+registry. You can find the settings here::
+
+    HKEY_CURRENT_USER\Software\OpenLP\OpenLP
+
+Troubleshooting
+===============
+
+Something has gone wrong, what should I do to help get it fixed?
+----------------------------------------------------------------
+
+If you have found an error in the program (what we call a bug) you should report 
+this to us so that OpenLP can be improved. Before reporting any bugs please 
+first make sure that there isn't already a bug report about your problem:
+
+#. Check the `Launchpad bug list <https://bugs.launchpad.net/openlp>`_
+#. `OpenLP support System <http://www.support.openlp.org/projects/openlp>`_
+#. Check the `bug reports <http://openlp.org/en/forums/openlp_20/bug_reports.html>`_ forum
+
+If there **is already a bug report**, you may be able to help by providing 
+further information. However, **if no one else has reported** it yet, then 
+please post a new bug report.
+
+#. The **preferred place** for reporting bugs is the
+   `bugs list <https://bugs.launchpad.net/openlp>`_ on Launchpad.
+#. Alternatively, if you don't have a Launchpad account and don't want to sign
+   up for one, you can post in the
+   `bug reports forum <http://openlp.org/en/forums/openlp_20/bug_reports.html>`_.
+#. If none of these ways suits you, you can send an email to
+   ``bugs (at) openlp.org``.
+
+What information should I include in a bug report?
+--------------------------------------------------
+
+Since OpenLP 1.9.4, there is a bug report dialog which automatically opens when
+OpenLP hits a serious bug. However, this doesn't appear all the time, and in
+some behavioural bugs, you'll have to file a bug report yourself. The following
+items are information the developers need in order to reproduce the bug.
+
+Operating System
+    Include information such as the version of your operating system, the
+    distribution (e.g. Ubuntu, Fedora, etc.) if you're using Linux, or the
+    edition (e.g. Home, Basic, Business, etc.) if you're using Windows.
+
+Version of OpenLP
+    You can find out the version of OpenLP by going to :menuselection:`Help --> About`
+
+Steps to Reproduce
+    The exact steps the developers need to follow in order to reproduce the bug.
+
+Version of MS Office or OpenOffice
+    If you're using the song imports or the presentation plugin, you'll need to
+    supply the version of Office, OpenOffice.org or LibreOffice.
+
+Bible Translation and Source
+    If the bug occurred while you were working with Bibles, specify the
+    translation of the Bible, and the source format if you imported it yourself.
+
+**Any** Other Information
+    Often bugs are caused by something that might not seem to be directly
+    related to the bug itself. If you have any other information with regards to
+    actions you performed or other activities when the bug occurred, it would be
+    welcomed by the developers.
+
+The more information you give us, the better we can help you.
+
+I've been asked to email a debug log, where do I find this?
+-----------------------------------------------------------
+
+We may need a debug log to help pin-point the issue. A new log file is created 
+each time you start OpenLP so copy the file before you run the software a second 
+time. On Windows a Debug option is available in the start menu. On other systems, 
+you will need to run OpenLP from the command line, with the following 
+option: ```-l debug```. Please note, that is a lowercase **L**.
+
+If you haven't been given a specific email address to send it to, then please do 
+not paste the log contents straight into a forum post. Instead, open the log 
+file in a text editor (such as notepad on Windows) and copy and paste the 
+contents into somewhere like `pastebin.com <http://pastebin.com>`_. Then give us 
+the link to the page that is created.
+
+Windows
+^^^^^^^
+
+Find the OpenLP 2.0 folder in your Start menu. Choose the "OpenLP (Debug)" option.
+
+OpenLP will start up. Go to the :menuselection:`Tools --> Open Data Folder` menu 
+option, and an Explorer window will appear containing folders such as alerts, 
+bibles, custom etc. Keep this Explorer window open.
+
+Now repeat the steps you need to take in OpenLP to reproduce the problem you had, 
+and then close down OpenLP. 
+
+In the Explorer window you left open, navigate up one level into the openlp 
+folder. You will see the ``openlp.log`` file. This is the file to e-mail.
+
+Linux/FreeBSD
+^^^^^^^^^^^^^
+
+If you installed OpenLP from a package::
+
+    @:~$ openlp -l debug
+
+Alternately, if you're running OpenLP from source::
+
+    @:~$ ./openlp.pyw -l debug
+
+If your Linux distribution supports the XDG standard, you'll find the log in::
+
+    ~/.cache/openlp/openlp.log
+
+Otherwise, you'll find the log file in::
+
+    ~/.openlp/openlp.log
+
+Mac OS X
+^^^^^^^^
+
+Open Terminal.app and navigate to where you installed OpenLP, usually 
+``/Applications``::
+
+    @:~$ cd /Applications
+
+Then go into the OpenLP.app directory, down to the OpenLP executable::
+
+    @:~$ cd OpenLP.app/Contents/MacOS
+
+And then run OpenLP in debug mode::
+
+    @:~$ ./openlp -l debug
+
+Once you've done that, you need to get the log file. In your home directory, 
+open the Library directory, and the Application Support directory within that. 
+Then open the openlp directory, and you should find the openlp.log file in that 
+directory::
+
+    /Users/<username>/Library/Application Support/openlp/openlp.log
+
+``<username>`` is your username.
+
+I'm on Windows and PowerPoint is installed, but it doesn't appear as an option
+------------------------------------------------------------------------------
+
+Try installing the `Visual C++ Runtime Redistributable <http://www.microsoft.com/downloads/details.aspx?FamilyID=9b2da534-3e03-4391-8a4d-074b9f2bc1bf&displaylang=en>`_.
+
+The command line shows many error messages
+------------------------------------------
+
+When running OpenLP from the command line, you might get something like this::
+
+    WARNING: bool Phonon::FactoryPrivate::createBackend() phonon backend plugin could not be loaded 
+    WARNING: bool Phonon::FactoryPrivate::createBackend() phonon backend plugin could not be loaded 
+    WARNING: Phonon::createPath: Cannot connect  Phonon::MediaObject ( no objectName ) to  VideoDisplay ( no objectName ). 
+    WARNING: Phonon::createPath: Cannot connect  Phonon::MediaObject ( no objectName ) to  Phonon::AudioOutput ( no objectName ). 
+    WARNING: bool Phonon::FactoryPrivate::createBackend() phonon backend plugin could not be loaded
+
+These error messages indicate that you need to install an appropriate backend 
+for Phonon.
+
+Linux/FreeBSD
+^^^^^^^^^^^^^
+
+If you're using Gnome, you need to install the GStreamer backend for Phonon. On 
+Ubuntu you would install the ```phonon-backend-gstreamer``` package::
+
+    @:~$ sudo aptitude install phonon-backend-gstreamer
+
+If you're using KDE, you need to install the Xine backend for Phonon. On Kubuntu 
+you would install the ```phonon-backend-xine``` package::
+
+    @:~$ sudo aptitude install phonon-backend-xine
+
+If you know which audiovisual system you're using, then install the appropriate 
+backend.
+
+phonon-backend-vlc may also be worth trying on some systems.
+
+Windows & Mac OS X
+^^^^^^^^^^^^^^^^^^
+
+Phonon should already be set up properly. If you're still having issues, let the 
+developers know.
+
+I've upgraded from 1.9.2 to a newer version, and now OpenLP crashes on load
+---------------------------------------------------------------------------
+
+You need to upgrade your song database. See this `blog post <http://openlp.org/en/users/jt/blog/2010-07-20-flag_day_database_schema_changes_in_trunk_revision_956.html>`_
+for information on how to do this.
+
+I've upgraded to 1.9.5, and now OpenLP has duplicates of many songs in the Media Manager
+----------------------------------------------------------------------------------------
+
+You need to run :menuselection:`Tools --> Re-index Songs`.
+
+There are no menu icons in OpenLP
+---------------------------------
+
+This may affect (only) Linux users with XFCE or Gnome. To solve the problem,
+follow the instructions on `this bug report <https://bugs.launchpad.net/ubuntu/+source/qt4-x11/+bug/501468/comments/3>`_.
+
+JPEG images don't work
+----------------------
+
+This is a known issue on some Mac OS X 10.5 systems, and has also been seen on 
+Windows XP too. The solution is to convert the image into another format such as 
+PNG.
+
+MP3's and other audio formats don't work
+----------------------------------------
+
+This is a known issue on some systems, including some XP machines, and we have 
+no solution at the moment.
+
+Videos can be slow or pixelated. Background Videos are very slow
+----------------------------------------------------------------
+
+If you are just playing videos from the Media plugin, try selecting the 
+:guilabel:`Use Phonon for Video playback` option in the Media configuration,
+accessible by going to :menuselection:`Settings --> Configure OpenLP --> Media`.
+As for text over video, we have no solution for speeding this up. Reducing the
+monitor resolution and avoiding shadows and outline text will help. We are
+hoping a future release of the toolkit we are using (QtWebKit) will help improve
+this, but there is no timeframe at present.
+
+Features
+========
+
+What new features will I find in 2.0?
+-------------------------------------
+
+Since 2.0 was a rewrite from the ground up, you won't find a great deal of new 
+features since initially we want to ensure all the 1.2 features are included. 
+However the developers have managed to sneak a few in. Take a look at the 
+`complete list <http://wiki.openlp.org/Version_2_Features>`_.
+
+Why hasn't popular feature request X been implemented?
+------------------------------------------------------
+
+We made a decision to first implement 1.2 features, before going wild on new 
+features. There are only a handful of developers working in their spare time. If 
+we were to try and include everything we wanted to implement, then 2.0 would not 
+likely ever get released.
+
+I have a great idea for a new feature, where should I suggest it?
+-----------------------------------------------------------------
+
+First of all check it isn't on the `Feature Requests <http://wiki.openlp.org/Feature_Requests>`_ 
+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.

=== added file 'manual/source/glossary.rst'
--- manual/source/glossary.rst	1970-01-01 00:00:00 +0000
+++ manual/source/glossary.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,127 @@
+.. _glossary:
+
+========
+Glossary
+========
+
+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:
+
+Display Tags
+------------
+
+:ref:`display-tags` give you the ability to add additional text formatting to text in
+songs and custom slides.
+
+.. _g-main-window:
+
+Main Window
+-----------
+
+The Main Window is what you will see when you first open OpenLP. It contains all
+the tools and plugins that make OpenLP function.
+
+.. image:: pics/mainwindow.png
+
+.. _g-media-manager:
+
+Media Manager
+-------------
+
+The Media Manager contains a number of tabs which the plugins supply to OpenLP.
+Each tab in the Media Manager is called a :ref:`g-media-item`. You can send
+songs, Bibles, etc from the :ref:`g-media-item` to the
+:ref:`g-preview-slide-controller` or :ref:`g-live-slide-controller`.
+
+.. image:: pics/mediamanager_songs.png
+
+.. _g-media-item:
+
+Media Item
+----------
+
+A media item is a tab in the :ref:`g-media-manager`. The media item contains
+any items from the various plugins which can be displayed on the display screen.
+
+.. g-platform:
+
+Platform
+--------
+
+When the word "platform" is used, it is usually referring to your operating
+system, Windows, Linux, (Mac) OS X or FreeBSD/PC-BSD.
+
+.. _g-preview-pane:
+
+Preview Pane
+------------
+
+The preview pane is a section to preview your media items before you go live
+with them.
+
+.. image:: pics/preview.png
+
+.. _g-service-file:
+
+Service File
+------------
+
+A service file is the file that is created when you save your service in OpenLP.
+The service file consist of **Service Items**
+
+.. _g-service-item:
+
+Service Item
+------------
+
+Service items are the **media items** that are in the **service manager**
+
+.. _g-service-manager:
+
+Service Manager
+---------------
+
+The service manager contains the media items in your service file. This is the
+area where your media items go live. You can also save, open, and edit
+services files from here.
+
+.. image:: pics/servicemanager.png
+
+.. _g-slide-controller:
+
+Slide Controller
+----------------
+
+The Slide Controller controls which slide from a **Service Item** is currently
+being displayed, and moving between the various slides.
+
+.. image:: pics/slidecontroller.png
+
+.. _g-preview-slide-controller:
+
+Preview Slide Controller
+------------------------
+
+The preview :ref:`g-slide-controller` shows you a simple preview of your item.
+It does not send any output to the display screen.
+
+.. _g-live-slide-controller:
+
+Live Slide Controller
+---------------------
+
+The live :ref:`g-slide-controller` controls the live output to the display
+screen.
+
+.. _g-theme-manager:
+
+Theme Manager
+-------------
+
+The theme manager is where themes are created and edited. Themes are the text
+styles and backgrounds that you use to personalize your services.
+
+.. image:: pics/thememanager.png

=== added file 'manual/source/index.rst'
--- manual/source/index.rst	1970-01-01 00:00:00 +0000
+++ manual/source/index.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,43 @@
+Welcome to the OpenLP 2.0 User Manual
+=====================================
+
+Getting Started With OpenLP
+---------------------------
+
+.. toctree::
+   :maxdepth: 2
+
+   introduction
+   system_requirements
+   install_windows_mac
+   install_linux
+   install_bsd
+   creating_service
+
+Reference Manual
+----------------
+
+.. toctree::
+   :maxdepth: 2
+
+   wizard
+   configure
+   dualmonitors
+   mediamanager
+   print_service
+   display_tags
+   themes
+   songs
+   bibles
+   custom_slides
+   alert
+   glossary
+
+Questions and Troubleshooting
+-----------------------------
+
+.. toctree::
+   :maxdepth: 2
+
+   faq
+   troubleshooting

=== added file 'manual/source/install_bsd.rst'
--- manual/source/install_bsd.rst	1970-01-01 00:00:00 +0000
+++ manual/source/install_bsd.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,31 @@
+Installing OpenLP on BSD
+========================
+
+PC-BSD
+^^^^^^
+
+You will need to have root privileges to install OpenLP. You will be asked for 
+the root password several times during installation.
+
+From the KickOff Menu select :guilabel:`System Settings`. From the System
+Settings select :guilabel:`Software & Updates`
+
+.. image:: pics/1pcbsd.png
+
+When prompted click on the :guilabel:`Run in Administrator Mode` button and
+enter your root password when asked.
+
+.. image:: pics/2pcbsd.png
+
+Type *openlp* into the search box then click :guilabel:`Search`. When OpenLP is
+located click on :guilabel:`Download`
+
+.. image:: pics/3pcbsd.png
+
+Confirm you want to download OpenLP. You should now be able to see the progress
+of the OpenLP download and installation.
+
+.. image:: pics/4pcbsd.png
+
+When the installation has completed OpenLP will be available from the KickOff menu.
+

=== added file 'manual/source/install_linux.rst'
--- manual/source/install_linux.rst	1970-01-01 00:00:00 +0000
+++ manual/source/install_linux.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,229 @@
+Installing OpenLP on Linux
+==========================
+
+Setting up OpenLP varies by distribution. We have included documentation on
+popular distributions or distributions that have OpenLP available from their
+package managers. It should be possible to get OpenLP running on 
+nearly any Linux distribution.
+
+Ubuntu
+^^^^^^
+
+Installation of OpenLP on Ubuntu can either be done through the Software Center
+or the command line. Command line instructions will be included at the end of
+this section on Ubuntu and its variants.
+
+Open up the software center by clicking on the :guilabel:`Software Center` icon
+in the Launcher if you are using the Unity desktop, or if you are using an 
+older version of Ubuntu, or the Classic Desktop go to :menuselection:`Applications`
+and select the Software Center from the bottom of the menu. You will need to 
+be the administrator of the system to install OpenLP and will be asked for the
+administrator password several times through this process.
+
+First you will need to add the OpenLP Personal Package Archive (PPA) to
+your system. Go to :menuselection:`Edit --> Software Sources`
+
+.. image:: pics/1softwaresources.png
+
+Click on the :menuselection:`Other Software` tab then click on the 
+:guilabel:`Add...` button to add the new software source.
+
+.. image:: pics/2othersoftware.png
+
+Add the APT line::
+
+  ppa:openlp-core/release
+  
+Click :guilabel:`Add Source`
+  
+.. image:: pics/3aptline.png
+
+You now need to restart the Software Center to refresh the package list. When
+you have the Software Center running simply search for OpenLP and click 
+:guilabel:`Install`.
+
+.. image:: pics/4searchopenlp.png
+
+You will see the install progress as OpenLP and the dependencies required for
+it to run are downloaded.
+
+.. image:: pics/5installprogressubuntu.png
+
+After installation you should see that OpenLP is installed.
+
+.. image:: pics/6installcompleteubuntu.png
+
+You can now run OpenLP by either searching for it in the *Dash*, or clicking on
+the category *Media Apps* in Unity. If you are running the Classic Desktop you 
+will have OpenLP available by clicking 
+:menuselection:`Applications --> Sound and Video --> OpenLP`
+
+Kubuntu
+^^^^^^^
+
+From the KickOff Menu click :guilabel:`System Settings` Then click on 
+:guilabel:`Software Management`.
+
+.. image:: pics/kubuntusystemsettings.png
+
+Click on settings in the left hand column.
+
+.. image:: pics/kubuntugetremovesoftware.png
+
+Click on the :guilabel:`Edit Origins` button.
+
+.. image:: pics/kubuntuaddremovesettings.png
+
+Click on the :guilabel:`Other Software` tab.
+
+.. image:: pics/kubuntusoftwaresources.png
+
+Click the :guilabel:`Add` button.
+
+.. image:: pics/kubuntuothersoftware.png
+
+Type the following in the text box::
+
+  ppa:openlp-core/release
+
+.. image:: pics/kubuntuaddapt.png
+
+After clicking :guilabel:`OK` you should now see new entries for OpenLP
+
+.. image:: pics/kubuntusoftwareopenlpadded.png
+
+Click :guilabel:`Close` when given the option to reload the software 
+information click the :guilabel:`Reload` button.
+
+.. image:: pics/kubuntureloadsources.png
+
+Click on :guilabel:`Get and Remove Software` in the left column. Type openlp in
+the search box. Next, click on :guilabel:`Find by name`. Once OpenLP is located
+click on the search result and click on :guilabel:`Install`. Click the
+:guilabel:`Apply` button to install OpenLP 
+
+.. image:: pics/kubuntuopenlpsearch.png
+
+You should now see the progress of the download.
+ 
+.. image:: pics/kubuntudownloadprogress.png
+
+Once completed you may have the option to start OpenLP from the window pictured
+below. If this feature is not enabled, you can start OpenLP from the KickOff
+menu.
+
+.. image:: pics/kubuntuopenlplaunch.png
+
+Ubuntu Command Line Install
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The following install procedure should work across all Ubuntu variants. You
+will need to add the Personal Package Archive (PPA) to Ubuntu's software 
+sources. From a terminal type::
+
+  user@ubuntu:~$ sudo add-apt-repository ppa:openlp-core/release
+  
+Now you need to refresh the package list::
+
+  user@ubuntu:~$ sudo apt-get update
+  
+Install OpenLP::
+
+  user@ubuntu:~$ sudo apt-get install openlp
+
+OpenLP should now be available in your desktop's menu system, but if you wish 
+to run OpenLP from the command line type::
+
+  user@ubuntu:~$ openlp
+
+Fedora (GNOME)
+^^^^^^^^^^^^^^
+
+**Note** When installing OpenLP you will need to have administrator privileges.
+You will be asked for the administrator password to install.
+
+Installing with Fedora you will use the default Add/Remove Programs available
+from :menuselection:`System --> Administration --> Add/Remove Programs` in 
+Fedora 14 and below or in :menuselection:`Applications --> System Tools --> 
+Add/Remove Programs`
+
+.. image:: pics/1fedoraaddremove.png
+
+Search for OpenLP in the search box
+
+.. image:: pics/2fedoraaddremove.png
+
+Check the check box for OpenLP then click :guilabel:`Apply`
+
+.. image:: pics/3fedoraaddremove.png
+
+Click :guilabel:`Continue` to confirm installing any additional software.
+
+.. image:: pics/4fedoraadditionalconfirm.png
+
+You should now see the packages downloading in the lower left corner.
+
+.. image:: pics/5fedoraaddremove.png
+
+Click :guilabel:`Run` to run OpenLP now, or :guilabel:`Close` to run OpenLP
+later.
+
+.. image:: pics/6fedoracomplete.png
+
+OpenLP will be available in :menuselection:`Applications --> Sound & Video --> OpenLP`
+
+Fedora (KDE)
+^^^^^^^^^^^^
+
+**Note** when installing OpenLP you will need to have administrator privileges.
+You will be asked for the administrator password to install.
+
+From the KickOff open *Software Management*. Type OpenLP into the search
+box. Then click :guilabel:`Find by name` or press :kbd:`Enter`.
+
+.. image:: pics/1fedoragetremove.png 
+
+Select OpenLP from the search results. Next, click :guilabel:`Apply`
+
+.. image:: pics/2fedoragetremove.png
+
+Now give permission to install other software dependencies that are needed by
+clicking :guilabel:`Continue`
+
+.. image:: pics/3fedoraadditionalchanges.png
+
+Once completed you can run OpenLP by clicking on its logo in the completed 
+install notification, or from the KickOff menu.
+
+.. image:: pics/4fedoracompleted.png
+
+Fedora Command Line Install
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To install OpenLP from the command line type::
+
+  user@fedora:~$ sudo yum install openlp
+
+OpenLP should now be available in your desktop's menu system, but if you wish 
+to run OpenLP from the command line type::
+
+  user@fedora:~$ openlp
+
+Arch Linux
+^^^^^^^^^^
+
+OpenLP is availabe on Arch Linux through the Arch User Repository, or AUR. Info
+on the AUR can be found `at the Arch wiki <https://wiki.archlinux.org/index.php/Arch_User_Repository>`_.
+
+There are a variety of tools and methods to install from the AUR. For this
+example we will demonstrate using Yaourt. For more info on Yaourt please see 
+the `Yaourt documentation <https://wiki.archlinux.org/index.php/Yaourt>`_.  
+
+From a terminal type::
+
+  user@arch:~$ yaourt -S openlp
+
+OpenLP should now be available in your desktop's menu system, but if you wish
+to run OpenLP from the command line type::
+
+  user@arch:~$ openlp

=== added file 'manual/source/install_windows_mac.rst'
--- manual/source/install_windows_mac.rst	1970-01-01 00:00:00 +0000
+++ manual/source/install_windows_mac.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,58 @@
+Installing OpenLP on 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`
+
+Installing OpenLP on 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

=== added file 'manual/source/introduction.rst'
--- manual/source/introduction.rst	1970-01-01 00:00:00 +0000
+++ manual/source/introduction.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,43 @@
+=============
+Introduction
+=============
+
+About
+-----
+
+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 PCs as required, 
+including the home PCs 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.
+
+GNU General Public License
+--------------------------
+
+The GNU General Public License was specifically chosen because it ensures the 
+above mentioned freedoms. It specifically states that you are not allowed 
+to charge for the software, and that you have to distribute the source code as 
+well.
+
+You can find a copy of the GNU General Public License from the Help menu 
+selecting about OpenLP or `view the license on-line <http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt>`_.

=== added file 'manual/source/mediamanager.rst'
--- manual/source/mediamanager.rst	1970-01-01 00:00:00 +0000
+++ manual/source/mediamanager.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,385 @@
+.. _media-manager:
+
+Media Manager
+=============
+
+Once you get your system set up for OpenLP you will be ready to add content to
+your :ref:`g-service-manager`. This will all happen through the
+:ref:`g-media-manager`. The :ref:`g-media-manager` contains all the Bibles,
+Songs, Presentations, Media, and Custom Slides that you will project through
+OpenLP.
+
+If you don't see the "Songs", "Bibles" and other media items in the
+:ref:`g-media-manager`, then refer to :ref:`t-no-media-items` in the
+troubleshooting guide.
+
+Songs
+-----
+
+Clicking on *Songs* in the :ref:`g-media-manager` will display the songs media
+item. The songs media item shows a list of all the songs in the songs database.
+
+.. image:: pics/mediamanager_songs.png
+
+Toolbar
+^^^^^^^
+
+|buttons_new| **Add song**
+    Open the song edit dialog to add a new song.
+
+|buttons_edit| **Edit song**
+    Open the song edit dialog to make changes to the selected song.
+
+|buttons_delete| **Delete song**
+    Remove the selected song(s) from the song list.
+
+|buttons_preview| **Preview song**
+    Send the selected song to the :ref:`g-preview-slide-controller`.
+
+|buttons_live| **Send song live**
+    Send the selected song to the :ref:`g-live-slide-controller` to be shown on
+    the display screen.
+
+|buttons_add| **Add song to service**
+    Add the selected song(s) to the :ref:`g-service-manager`. Songs can also be
+    added to the :ref:`g-service-manager` by means of drag and drop from the
+    :ref:`g-media-manager`.
+
+|buttons_db| **Maintain authors, topics and books**
+    Open the song maintenance dialog to add, edit or delete authors, topics or
+    song books.
+
+**Note:** Right-clicking on a song in the list will display some of the same
+options.
+
+Search
+^^^^^^
+
+.. image:: pics/mediamanager_songs_search.png
+
+Clicking on the icon in the search box displays a list of search options. The
+following options are available:
+
+|search_song| **Entire Song**
+    Search the title, lyrics and comments fields.
+
+|search_title| **Titles**
+    Search the title field only.
+
+|search_text| **Lyrics**
+    Search the lyrics field only.
+
+|search_author| **Authors**
+    Search the associated authors.
+
+|search_theme| **Themes**
+    Search the assigned themes.
+
+Click the :guilabel:`Search` button to perform a search and display the results
+in the song list.
+
+Bibles
+------
+
+Clicking on *Bibles* in the :ref:`g-media-manager` will display the Bibles media
+item. The Bibles media item shows Bible verses and provides a search function
+to find Bible verses and add them to the :ref:`g-service-manager`.
+
+.. image:: pics/mediamanager_bibles.png
+
+Toolbar
+^^^^^^^
+
+|buttons_import| **Import Bible**
+    Import Bibles from a number of formats. This is discussed in detail on the
+    :ref:`bibles-import` page.
+
+|buttons_preview| **Preview verses**
+    Send the selected verses to the :ref:`g-preview-slide-controller`.
+
+|buttons_live| **Send verses live**
+    Send the selected verses to the :ref:`g-live-slide-controller` to be shown
+    on the display screen.
+
+|buttons_add| **Add verses to service**
+    Add the selected verses to the :ref:`g-service-manager`. Verses can also be
+    added to the :ref:`g-service-manager` by means of drag and drop from the
+    :ref:`g-media-manager`.
+
+**Note:** Right-clicking on a selection of verses will display some of the
+same options.
+
+Quick Search Tab
+^^^^^^^^^^^^^^^^
+
+.. image:: pics/mediamanager_bibles_quick.png
+
+The following options are available on the quick search tab:
+
+**Find**
+    Clicking the icon in the Find box displays a list of search options. The
+    following options are available:
+
+    |search_reference| **Scripture Reference**
+        Search for a specific verse using a scripture reference format. The following formats are supported:
+
+        * 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
+
+    |search_text| **Text Search**
+        Search by a keyword or words. Use more words to narrow down the list
+        of results.
+
+**Version**
+    Once a Bible has been imported, it will be displayed in the drop down box.
+    Select a version from the list of the Bibles.
+    
+**Second**
+    If :guilabel:`Display second Bible verses` has been selected in the Bibles
+    configuration, this option will be available. This is used to display
+    another version of the Bible for comparison. Both versions will be
+    displayed. If there is not enough space on one slide, the Second verses
+    will be displayed on the next slide.
+    
+**Layout Style**
+    The following options are available to set how Bible verses are displayed:
+
+    **Verse Per Slide**
+        Display one verse per slide.
+
+    **Verse Per Line**
+        Start each verse on a new line until the slide is full.
+
+    **Continuous**
+        Verses flow together, separated by verse number and chapter
+        if chapter is selected to show above.
+
+    This setting is also accessible in :menuselection:`Setttings --> Configure OpenLP`
+    on the *Bibles* tab.
+
+    **Note:** Changes to layout style do not affect verses already in the
+    :ref:`g-service-manager`.
+
+|buttons_clear_results| |buttons_keep_results| **Keep/Clear Results**
+    Normally, when a search is run, the previous verses are cleared. To retain
+    the previous set of verses, toggle this button.
+
+Click the :guilabel:`Search` button to perform a search and display the results
+in the verse list.
+
+Advanced Tab
+^^^^^^^^^^^^
+
+.. image:: pics/mediamanager_bibles_advanced.png
+
+The Advanced tab is convenient for selecting Bible verses by book, chapter and
+verse from a set of drop down boxes.
+
+**Book**
+    Click on the drop down box and select a book from the list.
+
+**Chapter/Verse**
+    Select the *From* chapter and verse, and the *To* chapter and verse.
+
+*Version*, *Second* and *Layout Style* are the same as in the *Quick* search
+tab.
+
+Click the :guilabel:`Search` button to perform a search and display the results
+in the verse list.
+
+.. image:: pics/mediamanager_bibles_results.png
+
+Presentations
+-------------
+
+Clicking on *Presentations* in the :ref:`g-media-manager` will display the
+presentations media item. The presentations media item shows a list of imported
+presentations.
+
+.. image:: pics/mediamanager_presentations.png
+
+Toolbar
+^^^^^^^
+
+|buttons_open| **Load presentation**
+    Import a presentation. Presentations need to be imported in order to
+    control them from within OpenLP.
+
+|buttons_delete| **Delete presentation**
+    Removes the selected presentation from the list. Note that this does not
+    delete the original presentation from the disk.
+
+|buttons_preview| **Preview presentation**
+    Send the selected presentation to the :ref:`g-preview-slide-controller`.
+
+|buttons_live| **Send presentation live**
+    Send the selected presentation to the :ref:`g-live-slide-controller` to be
+    shown on the display screen.
+
+|buttons_add| **Add presentation to service**
+    Add the selected presentation to the :ref:`g-service-manager`. Presentations
+    can also be added to the :ref:`g-service-manager` by means of drag and drop
+    from the :ref:`g-media-manager`.
+
+**Note:** Right-clicking on a presentation will display some of the same options.
+
+Images
+------
+
+Clicking on *Images* in the :ref:`g-media-manager` will display the images
+media item. The images media item shows a list of imported images.
+
+.. image:: pics/mediamanager_images.png
+
+Toolbar
+^^^^^^^
+
+|buttons_open| **Load image**
+    Import one or more images. Images need to be imported in order to be used
+    in OpenLP.
+
+|buttons_delete| **Delete images**
+    Removes the selected image(s) from the list. Note that this does not
+    delete the original image(s) from the disk.
+
+|buttons_preview| **Preview image**
+    Send the selected image(s) to the :ref:`g-preview-slide-controller`.
+
+|buttons_live| **Send image live**
+    Send the selected image(s) to the :ref:`g-live-slide-controller` to be
+    shown on the display screen.
+
+|buttons_add| **Add image to service**
+    Add the selected image(s) to the :ref:`g-service-manager`. Images can also
+    be added to the :ref:`g-service-manager` by means of drag and drop from the
+    :ref:`g-media-manager`.
+
+|buttons_replace_live_background| **Replace live background**
+    Replace the current live theme background with the selected image. This
+    has effect until the theme changes, or the *Remove Backgound* button is
+    clicked.
+
+**Note:** Right-clicking on an image will display some of the same options.
+
+Media
+-----
+
+Clicking on *Media* in the :ref:`g-media-manager` will display the media item
+for media. The media item shows a list of imported audio or video files.
+
+**Note:** On some computers OpenLP has trouble displaying videos. Please read
+the `Frequently Asked Questions <http://wiki.openlp.org/faq>`_ for tips on how
+to resolve these issues.
+
+.. image:: pics/mediamanager_media.png
+
+Toolbar
+^^^^^^^
+
+|buttons_open| **Load media**
+    Import one or more media files. Media files need to be imported in order to
+    be used in OpenLP.
+
+|buttons_delete| **Delete media**
+    Removes the selected media file(s) from the list. Note that this does not
+    delete the original media file(s) from the disk.
+
+|buttons_preview| **Preview media**
+    Send the selected media to the :ref:`g-preview-slide-controller`.
+
+|buttons_live| **Send media live**
+    Send the selected media to the :ref:`g-live-slide-controller` to be shown
+    on the display screen.
+
+|buttons_add| **Add media to service**
+    Add the selected media to the :ref:`g-service-manager`. Media can also be
+    added to the :ref:`g-service-manager` by means of drag and drop from the
+    :ref:`g-media-manager`.
+
+|buttons_replace_live_background| **Replace live background**
+    Replace the current live theme background with the selected media. This
+    has effect until the theme changes, or the *Remove Backgound* button is
+    clicked.
+
+**Note:** Right-clicking on a media file will display some of the same options.
+
+Custom Slides
+-------------
+
+Clicking on *Custom Slides* in the :ref:`g-media-manager` will display the
+custom slides media item. The custom slides media item shows a list of custom
+textual items. Custom slides are useful for creating unstructured text items,
+such as liturgy or prayers.
+
+.. image:: pics/mediamanager_custom.png
+
+Toolbar
+^^^^^^^
+
+|buttons_new| **Add custom slide**
+    Open the song edit dialog to add a new custom slide.
+
+|buttons_edit| **Edit custom slide**
+    Open the song edit dialog to make changed to the selected new custom slide.
+
+|buttons_delete| **Delete custom slide**
+    Remove the selected custom slide(s) from the list.
+
+|buttons_preview| **Preview custom slide**
+    Send the selected custom slide to the :ref:`g-preview-slide-controller`.
+
+|buttons_live| **Send custom slide live**
+    Send the selected custom slide to the :ref:`g-live-slide-controller` to be
+    shown on the display screen.
+
+|buttons_add| **Add custom slide to service**
+    Add the selected custom slide(s) to the :ref:`g-service-manager`. Custom
+    slides can also be added to the :ref:`g-service-manager` by means of drag
+    and drop from the :ref:`g-media-manager`.
+
+**Note:** Right-clicking on a custom slide in the list will display some of the
+same options.
+
+.. These are all the image templates that are used in this page.
+
+.. |BUTTONS_NEW| image:: pics/buttons_new.png
+
+.. |BUTTONS_EDIT| image:: pics/buttons_edit.png
+
+.. |BUTTONS_DELETE| image:: pics/buttons_delete.png
+
+.. |BUTTONS_PREVIEW| image:: pics/buttons_preview.png
+
+.. |BUTTONS_LIVE| image:: pics/buttons_live.png
+
+.. |BUTTONS_ADD| image:: pics/buttons_add.png
+
+.. |BUTTONS_DB| image:: pics/buttons_db.png
+
+.. |BUTTONS_IMPORT| image:: pics/buttons_import.png
+
+.. |BUTTONS_OPEN| image:: pics/buttons_open.png
+
+.. |BUTTONS_KEEP_RESULTS| image:: pics/buttons_keep_results.png
+
+.. |BUTTONS_CLEAR_RESULTS| image:: pics/buttons_clear_results.png
+
+.. |BUTTONS_REPLACE_LIVE_BACKGROUND| image:: pics/buttons_replace_live_background.png
+
+.. |SEARCH_SONG| image:: pics/search_song.png
+
+.. |SEARCH_TITLE| image:: pics/search_title.png
+
+.. |SEARCH_AUTHOR| image:: pics/search_author.png
+
+.. |SEARCH_THEME| image:: pics/search_theme.png
+
+.. |SEARCH_REFERENCE| image:: pics/search_reference.png
+
+.. |SEARCH_TEXT| image:: pics/search_text.png
+

=== added directory 'manual/source/pics'
=== added file 'manual/source/pics/001-first-time-language.png'
Binary files manual/source/pics/001-first-time-language.png	1970-01-01 00:00:00 +0000 and manual/source/pics/001-first-time-language.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/002-first-time-wizard-welcome.png'
Binary files manual/source/pics/002-first-time-wizard-welcome.png	1970-01-01 00:00:00 +0000 and manual/source/pics/002-first-time-wizard-welcome.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/003-first-time-wizard-plugins.png'
Binary files manual/source/pics/003-first-time-wizard-plugins.png	1970-01-01 00:00:00 +0000 and manual/source/pics/003-first-time-wizard-plugins.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/004-first-time-wizard-songs.png'
Binary files manual/source/pics/004-first-time-wizard-songs.png	1970-01-01 00:00:00 +0000 and manual/source/pics/004-first-time-wizard-songs.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/005-first-time-wizard-bibles.png'
Binary files manual/source/pics/005-first-time-wizard-bibles.png	1970-01-01 00:00:00 +0000 and manual/source/pics/005-first-time-wizard-bibles.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/006-first-time-wizard-themes.png'
Binary files manual/source/pics/006-first-time-wizard-themes.png	1970-01-01 00:00:00 +0000 and manual/source/pics/006-first-time-wizard-themes.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/007-first-time-wizard-settings.png'
Binary files manual/source/pics/007-first-time-wizard-settings.png	1970-01-01 00:00:00 +0000 and manual/source/pics/007-first-time-wizard-settings.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/009-first-time-wizard-progress.png'
Binary files manual/source/pics/009-first-time-wizard-progress.png	1970-01-01 00:00:00 +0000 and manual/source/pics/009-first-time-wizard-progress.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/010-first-time-wizard-finished.png'
Binary files manual/source/pics/010-first-time-wizard-finished.png	1970-01-01 00:00:00 +0000 and manual/source/pics/010-first-time-wizard-finished.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/011-first-time-wizard-song-import.png'
Binary files manual/source/pics/011-first-time-wizard-song-import.png	1970-01-01 00:00:00 +0000 and manual/source/pics/011-first-time-wizard-song-import.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/012-openlp-main-window.png'
Binary files manual/source/pics/012-openlp-main-window.png	1970-01-01 00:00:00 +0000 and manual/source/pics/012-openlp-main-window.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/1fedoraaddremove.png'
Binary files manual/source/pics/1fedoraaddremove.png	1970-01-01 00:00:00 +0000 and manual/source/pics/1fedoraaddremove.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/1fedoragetremove.png'
Binary files manual/source/pics/1fedoragetremove.png	1970-01-01 00:00:00 +0000 and manual/source/pics/1fedoragetremove.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/1pcbsd.png'
Binary files manual/source/pics/1pcbsd.png	1970-01-01 00:00:00 +0000 and manual/source/pics/1pcbsd.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/1softwaresources.png'
Binary files manual/source/pics/1softwaresources.png	1970-01-01 00:00:00 +0000 and manual/source/pics/1softwaresources.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/2fedoraaddremove.png'
Binary files manual/source/pics/2fedoraaddremove.png	1970-01-01 00:00:00 +0000 and manual/source/pics/2fedoraaddremove.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/2fedoragetremove.png'
Binary files manual/source/pics/2fedoragetremove.png	1970-01-01 00:00:00 +0000 and manual/source/pics/2fedoragetremove.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/2othersoftware.png'
Binary files manual/source/pics/2othersoftware.png	1970-01-01 00:00:00 +0000 and manual/source/pics/2othersoftware.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/2pcbsd.png'
Binary files manual/source/pics/2pcbsd.png	1970-01-01 00:00:00 +0000 and manual/source/pics/2pcbsd.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/3aptline.png'
Binary files manual/source/pics/3aptline.png	1970-01-01 00:00:00 +0000 and manual/source/pics/3aptline.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/3fedoraadditionalchanges.png'
Binary files manual/source/pics/3fedoraadditionalchanges.png	1970-01-01 00:00:00 +0000 and manual/source/pics/3fedoraadditionalchanges.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/3fedoraaddremove.png'
Binary files manual/source/pics/3fedoraaddremove.png	1970-01-01 00:00:00 +0000 and manual/source/pics/3fedoraaddremove.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/3pcbsd.png'
Binary files manual/source/pics/3pcbsd.png	1970-01-01 00:00:00 +0000 and manual/source/pics/3pcbsd.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/4fedoraadditionalconfirm.png'
Binary files manual/source/pics/4fedoraadditionalconfirm.png	1970-01-01 00:00:00 +0000 and manual/source/pics/4fedoraadditionalconfirm.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/4fedoracompleted.png'
Binary files manual/source/pics/4fedoracompleted.png	1970-01-01 00:00:00 +0000 and manual/source/pics/4fedoracompleted.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/4pcbsd.png'
Binary files manual/source/pics/4pcbsd.png	1970-01-01 00:00:00 +0000 and manual/source/pics/4pcbsd.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/4searchopenlp.png'
Binary files manual/source/pics/4searchopenlp.png	1970-01-01 00:00:00 +0000 and manual/source/pics/4searchopenlp.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/5fedoraaddremove.png'
Binary files manual/source/pics/5fedoraaddremove.png	1970-01-01 00:00:00 +0000 and manual/source/pics/5fedoraaddremove.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/5installprogressubuntu.png'
Binary files manual/source/pics/5installprogressubuntu.png	1970-01-01 00:00:00 +0000 and manual/source/pics/5installprogressubuntu.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/6fedoracomplete.png'
Binary files manual/source/pics/6fedoracomplete.png	1970-01-01 00:00:00 +0000 and manual/source/pics/6fedoracomplete.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/6installcompleteubuntu.png'
Binary files manual/source/pics/6installcompleteubuntu.png	1970-01-01 00:00:00 +0000 and manual/source/pics/6installcompleteubuntu.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/additionaltask.png'
Binary files manual/source/pics/additionaltask.png	1970-01-01 00:00:00 +0000 and manual/source/pics/additionaltask.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/addsong.png'
Binary files manual/source/pics/addsong.png	1970-01-01 00:00:00 +0000 and manual/source/pics/addsong.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/addsongservice1.png'
Binary files manual/source/pics/addsongservice1.png	1970-01-01 00:00:00 +0000 and manual/source/pics/addsongservice1.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/addsongservice2.png'
Binary files manual/source/pics/addsongservice2.png	1970-01-01 00:00:00 +0000 and manual/source/pics/addsongservice2.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/alert.png'
Binary files manual/source/pics/alert.png	1970-01-01 00:00:00 +0000 and manual/source/pics/alert.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/authorstopicsbooks.png'
Binary files manual/source/pics/authorstopicsbooks.png	1970-01-01 00:00:00 +0000 and manual/source/pics/authorstopicsbooks.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/bibleimport01.png'
Binary files manual/source/pics/bibleimport01.png	1970-01-01 00:00:00 +0000 and manual/source/pics/bibleimport01.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/bibleimport02.png'
Binary files manual/source/pics/bibleimport02.png	1970-01-01 00:00:00 +0000 and manual/source/pics/bibleimport02.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/bibleimportdetails1.png'
Binary files manual/source/pics/bibleimportdetails1.png	1970-01-01 00:00:00 +0000 and manual/source/pics/bibleimportdetails1.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/bibleimportfinished1.png'
Binary files manual/source/pics/bibleimportfinished1.png	1970-01-01 00:00:00 +0000 and manual/source/pics/bibleimportfinished1.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/biblewebcomplete.png'
Binary files manual/source/pics/biblewebcomplete.png	1970-01-01 00:00:00 +0000 and manual/source/pics/biblewebcomplete.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/buttons_add.png'
Binary files manual/source/pics/buttons_add.png	1970-01-01 00:00:00 +0000 and manual/source/pics/buttons_add.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/buttons_clear_results.png'
Binary files manual/source/pics/buttons_clear_results.png	1970-01-01 00:00:00 +0000 and manual/source/pics/buttons_clear_results.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/buttons_db.png'
Binary files manual/source/pics/buttons_db.png	1970-01-01 00:00:00 +0000 and manual/source/pics/buttons_db.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/buttons_delete.png'
Binary files manual/source/pics/buttons_delete.png	1970-01-01 00:00:00 +0000 and manual/source/pics/buttons_delete.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/buttons_edit.png'
Binary files manual/source/pics/buttons_edit.png	1970-01-01 00:00:00 +0000 and manual/source/pics/buttons_edit.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/buttons_export.png'
Binary files manual/source/pics/buttons_export.png	1970-01-01 00:00:00 +0000 and manual/source/pics/buttons_export.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/buttons_import.png'
Binary files manual/source/pics/buttons_import.png	1970-01-01 00:00:00 +0000 and manual/source/pics/buttons_import.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/buttons_keep_results.png'
Binary files manual/source/pics/buttons_keep_results.png	1970-01-01 00:00:00 +0000 and manual/source/pics/buttons_keep_results.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/buttons_live.png'
Binary files manual/source/pics/buttons_live.png	1970-01-01 00:00:00 +0000 and manual/source/pics/buttons_live.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/buttons_new.png'
Binary files manual/source/pics/buttons_new.png	1970-01-01 00:00:00 +0000 and manual/source/pics/buttons_new.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/buttons_open.png'
Binary files manual/source/pics/buttons_open.png	1970-01-01 00:00:00 +0000 and manual/source/pics/buttons_open.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/buttons_preview.png'
Binary files manual/source/pics/buttons_preview.png	1970-01-01 00:00:00 +0000 and manual/source/pics/buttons_preview.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/buttons_replace_live_background.png'
Binary files manual/source/pics/buttons_replace_live_background.png	1970-01-01 00:00:00 +0000 and manual/source/pics/buttons_replace_live_background.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/closebutton.png'
Binary files manual/source/pics/closebutton.png	1970-01-01 00:00:00 +0000 and manual/source/pics/closebutton.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/configure_display_tags.png'
Binary files manual/source/pics/configure_display_tags.png	1970-01-01 00:00:00 +0000 and manual/source/pics/configure_display_tags.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/configureadvanced.png'
Binary files manual/source/pics/configureadvanced.png	1970-01-01 00:00:00 +0000 and manual/source/pics/configureadvanced.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/configurealerts.png'
Binary files manual/source/pics/configurealerts.png	1970-01-01 00:00:00 +0000 and manual/source/pics/configurealerts.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/configurebibles.png'
Binary files manual/source/pics/configurebibles.png	1970-01-01 00:00:00 +0000 and manual/source/pics/configurebibles.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/configurecustom.png'
Binary files manual/source/pics/configurecustom.png	1970-01-01 00:00:00 +0000 and manual/source/pics/configurecustom.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/configuregeneral.png'
Binary files manual/source/pics/configuregeneral.png	1970-01-01 00:00:00 +0000 and manual/source/pics/configuregeneral.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/configuremedia.png'
Binary files manual/source/pics/configuremedia.png	1970-01-01 00:00:00 +0000 and manual/source/pics/configuremedia.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/configurepresentations.png'
Binary files manual/source/pics/configurepresentations.png	1970-01-01 00:00:00 +0000 and manual/source/pics/configurepresentations.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/configureremotes.png'
Binary files manual/source/pics/configureremotes.png	1970-01-01 00:00:00 +0000 and manual/source/pics/configureremotes.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/configuresongs.png'
Binary files manual/source/pics/configuresongs.png	1970-01-01 00:00:00 +0000 and manual/source/pics/configuresongs.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/configurethemes.png'
Binary files manual/source/pics/configurethemes.png	1970-01-01 00:00:00 +0000 and manual/source/pics/configurethemes.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/copybutton.png'
Binary files manual/source/pics/copybutton.png	1970-01-01 00:00:00 +0000 and manual/source/pics/copybutton.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/copyhtmlbutton.png'
Binary files manual/source/pics/copyhtmlbutton.png	1970-01-01 00:00:00 +0000 and manual/source/pics/copyhtmlbutton.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/createthemeicon.png'
Binary files manual/source/pics/createthemeicon.png	1970-01-01 00:00:00 +0000 and manual/source/pics/createthemeicon.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/csvimport1.png'
Binary files manual/source/pics/csvimport1.png	1970-01-01 00:00:00 +0000 and manual/source/pics/csvimport1.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/csvimport2.png'
Binary files manual/source/pics/csvimport2.png	1970-01-01 00:00:00 +0000 and manual/source/pics/csvimport2.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/dvi.png'
Binary files manual/source/pics/dvi.png	1970-01-01 00:00:00 +0000 and manual/source/pics/dvi.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/finishedimport.png'
Binary files manual/source/pics/finishedimport.png	1970-01-01 00:00:00 +0000 and manual/source/pics/finishedimport.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/general_print.png'
Binary files manual/source/pics/general_print.png	1970-01-01 00:00:00 +0000 and manual/source/pics/general_print.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/general_zoom_in.png'
Binary files manual/source/pics/general_zoom_in.png	1970-01-01 00:00:00 +0000 and manual/source/pics/general_zoom_in.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/general_zoom_original.png'
Binary files manual/source/pics/general_zoom_original.png	1970-01-01 00:00:00 +0000 and manual/source/pics/general_zoom_original.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/general_zoom_out.png'
Binary files manual/source/pics/general_zoom_out.png	1970-01-01 00:00:00 +0000 and manual/source/pics/general_zoom_out.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/gnome.png'
Binary files manual/source/pics/gnome.png	1970-01-01 00:00:00 +0000 and manual/source/pics/gnome.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/gnome3displays.png'
Binary files manual/source/pics/gnome3displays.png	1970-01-01 00:00:00 +0000 and manual/source/pics/gnome3displays.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/gnome3drag.png'
Binary files manual/source/pics/gnome3drag.png	1970-01-01 00:00:00 +0000 and manual/source/pics/gnome3drag.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/hdmi.png'
Binary files manual/source/pics/hdmi.png	1970-01-01 00:00:00 +0000 and manual/source/pics/hdmi.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/installcomplete.png'
Binary files manual/source/pics/installcomplete.png	1970-01-01 00:00:00 +0000 and manual/source/pics/installcomplete.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/installlocation.png'
Binary files manual/source/pics/installlocation.png	1970-01-01 00:00:00 +0000 and manual/source/pics/installlocation.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/kdedisplay.png'
Binary files manual/source/pics/kdedisplay.png	1970-01-01 00:00:00 +0000 and manual/source/pics/kdedisplay.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/kdesystemsettings.png'
Binary files manual/source/pics/kdesystemsettings.png	1970-01-01 00:00:00 +0000 and manual/source/pics/kdesystemsettings.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/kubuntuaddapt.png'
Binary files manual/source/pics/kubuntuaddapt.png	1970-01-01 00:00:00 +0000 and manual/source/pics/kubuntuaddapt.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/kubuntuaddremovesettings.png'
Binary files manual/source/pics/kubuntuaddremovesettings.png	1970-01-01 00:00:00 +0000 and manual/source/pics/kubuntuaddremovesettings.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/kubuntudownloadprogress.png'
Binary files manual/source/pics/kubuntudownloadprogress.png	1970-01-01 00:00:00 +0000 and manual/source/pics/kubuntudownloadprogress.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/kubuntugetremovesoftware.png'
Binary files manual/source/pics/kubuntugetremovesoftware.png	1970-01-01 00:00:00 +0000 and manual/source/pics/kubuntugetremovesoftware.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/kubuntuopenlplaunch.png'
Binary files manual/source/pics/kubuntuopenlplaunch.png	1970-01-01 00:00:00 +0000 and manual/source/pics/kubuntuopenlplaunch.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/kubuntuopenlpsearch.png'
Binary files manual/source/pics/kubuntuopenlpsearch.png	1970-01-01 00:00:00 +0000 and manual/source/pics/kubuntuopenlpsearch.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/kubuntuothersoftware.png'
Binary files manual/source/pics/kubuntuothersoftware.png	1970-01-01 00:00:00 +0000 and manual/source/pics/kubuntuothersoftware.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/kubuntureloadsources.png'
Binary files manual/source/pics/kubuntureloadsources.png	1970-01-01 00:00:00 +0000 and manual/source/pics/kubuntureloadsources.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/kubuntusoftwareopenlpadded.png'
Binary files manual/source/pics/kubuntusoftwareopenlpadded.png	1970-01-01 00:00:00 +0000 and manual/source/pics/kubuntusoftwareopenlpadded.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/kubuntusoftwaresources.png'
Binary files manual/source/pics/kubuntusoftwaresources.png	1970-01-01 00:00:00 +0000 and manual/source/pics/kubuntusoftwaresources.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/kubuntusystemsettings.png'
Binary files manual/source/pics/kubuntusystemsettings.png	1970-01-01 00:00:00 +0000 and manual/source/pics/kubuntusystemsettings.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/license.png'
Binary files manual/source/pics/license.png	1970-01-01 00:00:00 +0000 and manual/source/pics/license.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/logo.png'
Binary files manual/source/pics/logo.png	1970-01-01 00:00:00 +0000 and manual/source/pics/logo.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/mainwindow.png'
Binary files manual/source/pics/mainwindow.png	1970-01-01 00:00:00 +0000 and manual/source/pics/mainwindow.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/mediamanager.png'
Binary files manual/source/pics/mediamanager.png	1970-01-01 00:00:00 +0000 and manual/source/pics/mediamanager.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/mediamanager_bibles.png'
Binary files manual/source/pics/mediamanager_bibles.png	1970-01-01 00:00:00 +0000 and manual/source/pics/mediamanager_bibles.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/mediamanager_bibles_advanced.png'
Binary files manual/source/pics/mediamanager_bibles_advanced.png	1970-01-01 00:00:00 +0000 and manual/source/pics/mediamanager_bibles_advanced.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/mediamanager_bibles_buttons.png'
Binary files manual/source/pics/mediamanager_bibles_buttons.png	1970-01-01 00:00:00 +0000 and manual/source/pics/mediamanager_bibles_buttons.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/mediamanager_bibles_quick.png'
Binary files manual/source/pics/mediamanager_bibles_quick.png	1970-01-01 00:00:00 +0000 and manual/source/pics/mediamanager_bibles_quick.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/mediamanager_bibles_results.png'
Binary files manual/source/pics/mediamanager_bibles_results.png	1970-01-01 00:00:00 +0000 and manual/source/pics/mediamanager_bibles_results.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/mediamanager_buttons.png'
Binary files manual/source/pics/mediamanager_buttons.png	1970-01-01 00:00:00 +0000 and manual/source/pics/mediamanager_buttons.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/mediamanager_custom.png'
Binary files manual/source/pics/mediamanager_custom.png	1970-01-01 00:00:00 +0000 and manual/source/pics/mediamanager_custom.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/mediamanager_custom_buttons.png'
Binary files manual/source/pics/mediamanager_custom_buttons.png	1970-01-01 00:00:00 +0000 and manual/source/pics/mediamanager_custom_buttons.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/mediamanager_custom_edit.png'
Binary files manual/source/pics/mediamanager_custom_edit.png	1970-01-01 00:00:00 +0000 and manual/source/pics/mediamanager_custom_edit.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/mediamanager_custom_search.png'
Binary files manual/source/pics/mediamanager_custom_search.png	1970-01-01 00:00:00 +0000 and manual/source/pics/mediamanager_custom_search.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/mediamanager_images.png'
Binary files manual/source/pics/mediamanager_images.png	1970-01-01 00:00:00 +0000 and manual/source/pics/mediamanager_images.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/mediamanager_images_buttons.png'
Binary files manual/source/pics/mediamanager_images_buttons.png	1970-01-01 00:00:00 +0000 and manual/source/pics/mediamanager_images_buttons.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/mediamanager_media.png'
Binary files manual/source/pics/mediamanager_media.png	1970-01-01 00:00:00 +0000 and manual/source/pics/mediamanager_media.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/mediamanager_media_buttons.png'
Binary files manual/source/pics/mediamanager_media_buttons.png	1970-01-01 00:00:00 +0000 and manual/source/pics/mediamanager_media_buttons.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/mediamanager_presentations.png'
Binary files manual/source/pics/mediamanager_presentations.png	1970-01-01 00:00:00 +0000 and manual/source/pics/mediamanager_presentations.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/mediamanager_presentations_buttons.png'
Binary files manual/source/pics/mediamanager_presentations_buttons.png	1970-01-01 00:00:00 +0000 and manual/source/pics/mediamanager_presentations_buttons.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/mediamanager_songs.png'
Binary files manual/source/pics/mediamanager_songs.png	1970-01-01 00:00:00 +0000 and manual/source/pics/mediamanager_songs.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/mediamanager_songs_buttons.png'
Binary files manual/source/pics/mediamanager_songs_buttons.png	1970-01-01 00:00:00 +0000 and manual/source/pics/mediamanager_songs_buttons.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/mediamanager_songs_search.png'
Binary files manual/source/pics/mediamanager_songs_search.png	1970-01-01 00:00:00 +0000 and manual/source/pics/mediamanager_songs_search.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/nvlinux1.png'
Binary files manual/source/pics/nvlinux1.png	1970-01-01 00:00:00 +0000 and manual/source/pics/nvlinux1.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/openlp.ico'
Binary files manual/source/pics/openlp.ico	1970-01-01 00:00:00 +0000 and manual/source/pics/openlp.ico	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/optionsbutton.png'
Binary files manual/source/pics/optionsbutton.png	1970-01-01 00:00:00 +0000 and manual/source/pics/optionsbutton.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/osxinstall.png'
Binary files manual/source/pics/osxinstall.png	1970-01-01 00:00:00 +0000 and manual/source/pics/osxinstall.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/phononcheckbox.png'
Binary files manual/source/pics/phononcheckbox.png	1970-01-01 00:00:00 +0000 and manual/source/pics/phononcheckbox.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/plugins.png'
Binary files manual/source/pics/plugins.png	1970-01-01 00:00:00 +0000 and manual/source/pics/plugins.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/preview.png'
Binary files manual/source/pics/preview.png	1970-01-01 00:00:00 +0000 and manual/source/pics/preview.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/previewsong1.png'
Binary files manual/source/pics/previewsong1.png	1970-01-01 00:00:00 +0000 and manual/source/pics/previewsong1.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/previewsong2.png'
Binary files manual/source/pics/previewsong2.png	1970-01-01 00:00:00 +0000 and manual/source/pics/previewsong2.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/printbutton.png'
Binary files manual/source/pics/printbutton.png	1970-01-01 00:00:00 +0000 and manual/source/pics/printbutton.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/printservice1.png'
Binary files manual/source/pics/printservice1.png	1970-01-01 00:00:00 +0000 and manual/source/pics/printservice1.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/printservice2.png'
Binary files manual/source/pics/printservice2.png	1970-01-01 00:00:00 +0000 and manual/source/pics/printservice2.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/printservice3.png'
Binary files manual/source/pics/printservice3.png	1970-01-01 00:00:00 +0000 and manual/source/pics/printservice3.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/progress.png'
Binary files manual/source/pics/progress.png	1970-01-01 00:00:00 +0000 and manual/source/pics/progress.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/readytoinstall.png'
Binary files manual/source/pics/readytoinstall.png	1970-01-01 00:00:00 +0000 and manual/source/pics/readytoinstall.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/search_author.png'
Binary files manual/source/pics/search_author.png	1970-01-01 00:00:00 +0000 and manual/source/pics/search_author.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/search_reference.png'
Binary files manual/source/pics/search_reference.png	1970-01-01 00:00:00 +0000 and manual/source/pics/search_reference.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/search_song.png'
Binary files manual/source/pics/search_song.png	1970-01-01 00:00:00 +0000 and manual/source/pics/search_song.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/search_text.png'
Binary files manual/source/pics/search_text.png	1970-01-01 00:00:00 +0000 and manual/source/pics/search_text.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/search_theme.png'
Binary files manual/source/pics/search_theme.png	1970-01-01 00:00:00 +0000 and manual/source/pics/search_theme.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/search_title.png'
Binary files manual/source/pics/search_title.png	1970-01-01 00:00:00 +0000 and manual/source/pics/search_title.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/selectlanguage.png'
Binary files manual/source/pics/selectlanguage.png	1970-01-01 00:00:00 +0000 and manual/source/pics/selectlanguage.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/selectsongs.png'
Binary files manual/source/pics/selectsongs.png	1970-01-01 00:00:00 +0000 and manual/source/pics/selectsongs.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/sendsonglive1.png'
Binary files manual/source/pics/sendsonglive1.png	1970-01-01 00:00:00 +0000 and manual/source/pics/sendsonglive1.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/sendsonglive2.png'
Binary files manual/source/pics/sendsonglive2.png	1970-01-01 00:00:00 +0000 and manual/source/pics/sendsonglive2.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/service_add.png'
Binary files manual/source/pics/service_add.png	1970-01-01 00:00:00 +0000 and manual/source/pics/service_add.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/service_arrows.png'
Binary files manual/source/pics/service_arrows.png	1970-01-01 00:00:00 +0000 and manual/source/pics/service_arrows.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/service_blank.png'
Binary files manual/source/pics/service_blank.png	1970-01-01 00:00:00 +0000 and manual/source/pics/service_blank.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/service_images.png'
Binary files manual/source/pics/service_images.png	1970-01-01 00:00:00 +0000 and manual/source/pics/service_images.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/service_item_notes.png'
Binary files manual/source/pics/service_item_notes.png	1970-01-01 00:00:00 +0000 and manual/source/pics/service_item_notes.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/service_live.png'
Binary files manual/source/pics/service_live.png	1970-01-01 00:00:00 +0000 and manual/source/pics/service_live.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/service_live_arrows.png'
Binary files manual/source/pics/service_live_arrows.png	1970-01-01 00:00:00 +0000 and manual/source/pics/service_live_arrows.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/service_manager.png'
Binary files manual/source/pics/service_manager.png	1970-01-01 00:00:00 +0000 and manual/source/pics/service_manager.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/service_note.png'
Binary files manual/source/pics/service_note.png	1970-01-01 00:00:00 +0000 and manual/source/pics/service_note.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/service_reorder.png'
Binary files manual/source/pics/service_reorder.png	1970-01-01 00:00:00 +0000 and manual/source/pics/service_reorder.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/service_reorder_service_item.png'
Binary files manual/source/pics/service_reorder_service_item.png	1970-01-01 00:00:00 +0000 and manual/source/pics/service_reorder_service_item.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/service_save.png'
Binary files manual/source/pics/service_save.png	1970-01-01 00:00:00 +0000 and manual/source/pics/service_save.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/service_send_live.png'
Binary files manual/source/pics/service_send_live.png	1970-01-01 00:00:00 +0000 and manual/source/pics/service_send_live.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/service_timer.png'
Binary files manual/source/pics/service_timer.png	1970-01-01 00:00:00 +0000 and manual/source/pics/service_timer.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/servicemanager.png'
Binary files manual/source/pics/servicemanager.png	1970-01-01 00:00:00 +0000 and manual/source/pics/servicemanager.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/slidecontroller.png'
Binary files manual/source/pics/slidecontroller.png	1970-01-01 00:00:00 +0000 and manual/source/pics/slidecontroller.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/song_edit_author_maintenance.png'
Binary files manual/source/pics/song_edit_author_maintenance.png	1970-01-01 00:00:00 +0000 and manual/source/pics/song_edit_author_maintenance.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/song_edit_authors.png'
Binary files manual/source/pics/song_edit_authors.png	1970-01-01 00:00:00 +0000 and manual/source/pics/song_edit_authors.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/song_edit_lyrics.png'
Binary files manual/source/pics/song_edit_lyrics.png	1970-01-01 00:00:00 +0000 and manual/source/pics/song_edit_lyrics.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/song_edit_maintenance.png'
Binary files manual/source/pics/song_edit_maintenance.png	1970-01-01 00:00:00 +0000 and manual/source/pics/song_edit_maintenance.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/song_edit_songbook_maintenance.png'
Binary files manual/source/pics/song_edit_songbook_maintenance.png	1970-01-01 00:00:00 +0000 and manual/source/pics/song_edit_songbook_maintenance.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/song_edit_theme_copyright.png'
Binary files manual/source/pics/song_edit_theme_copyright.png	1970-01-01 00:00:00 +0000 and manual/source/pics/song_edit_theme_copyright.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/song_edit_topic_maintenance.png'
Binary files manual/source/pics/song_edit_topic_maintenance.png	1970-01-01 00:00:00 +0000 and manual/source/pics/song_edit_topic_maintenance.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/song_edit_verse_error.png'
Binary files manual/source/pics/song_edit_verse_error.png	1970-01-01 00:00:00 +0000 and manual/source/pics/song_edit_verse_error.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/song_edit_verse_type.png'
Binary files manual/source/pics/song_edit_verse_type.png	1970-01-01 00:00:00 +0000 and manual/source/pics/song_edit_verse_type.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/songeditor1.png'
Binary files manual/source/pics/songeditor1.png	1970-01-01 00:00:00 +0000 and manual/source/pics/songeditor1.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/songeditor11.png'
Binary files manual/source/pics/songeditor11.png	1970-01-01 00:00:00 +0000 and manual/source/pics/songeditor11.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/songeditor2.png'
Binary files manual/source/pics/songeditor2.png	1970-01-01 00:00:00 +0000 and manual/source/pics/songeditor2.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/songeditor3.png'
Binary files manual/source/pics/songeditor3.png	1970-01-01 00:00:00 +0000 and manual/source/pics/songeditor3.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/songeditor4.png'
Binary files manual/source/pics/songeditor4.png	1970-01-01 00:00:00 +0000 and manual/source/pics/songeditor4.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/songeditor5.png'
Binary files manual/source/pics/songeditor5.png	1970-01-01 00:00:00 +0000 and manual/source/pics/songeditor5.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/songeditor6.png'
Binary files manual/source/pics/songeditor6.png	1970-01-01 00:00:00 +0000 and manual/source/pics/songeditor6.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/songeditor7.png'
Binary files manual/source/pics/songeditor7.png	1970-01-01 00:00:00 +0000 and manual/source/pics/songeditor7.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/songeditor8.png'
Binary files manual/source/pics/songeditor8.png	1970-01-01 00:00:00 +0000 and manual/source/pics/songeditor8.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/songeditor9.png'
Binary files manual/source/pics/songeditor9.png	1970-01-01 00:00:00 +0000 and manual/source/pics/songeditor9.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/songimporter.png'
Binary files manual/source/pics/songimporter.png	1970-01-01 00:00:00 +0000 and manual/source/pics/songimporter.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/songimporterchoices.png'
Binary files manual/source/pics/songimporterchoices.png	1970-01-01 00:00:00 +0000 and manual/source/pics/songimporterchoices.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/songs12.png'
Binary files manual/source/pics/songs12.png	1970-01-01 00:00:00 +0000 and manual/source/pics/songs12.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/songs13.png'
Binary files manual/source/pics/songs13.png	1970-01-01 00:00:00 +0000 and manual/source/pics/songs13.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/songs14.png'
Binary files manual/source/pics/songs14.png	1970-01-01 00:00:00 +0000 and manual/source/pics/songs14.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/songs15.png'
Binary files manual/source/pics/songs15.png	1970-01-01 00:00:00 +0000 and manual/source/pics/songs15.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/songs16.png'
Binary files manual/source/pics/songs16.png	1970-01-01 00:00:00 +0000 and manual/source/pics/songs16.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/songs17.png'
Binary files manual/source/pics/songs17.png	1970-01-01 00:00:00 +0000 and manual/source/pics/songs17.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/songselectlyrics.png'
Binary files manual/source/pics/songselectlyrics.png	1970-01-01 00:00:00 +0000 and manual/source/pics/songselectlyrics.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/songselectsongsearch.png'
Binary files manual/source/pics/songselectsongsearch.png	1970-01-01 00:00:00 +0000 and manual/source/pics/songselectsongsearch.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/songusage.png'
Binary files manual/source/pics/songusage.png	1970-01-01 00:00:00 +0000 and manual/source/pics/songusage.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/songusagedelete.png'
Binary files manual/source/pics/songusagedelete.png	1970-01-01 00:00:00 +0000 and manual/source/pics/songusagedelete.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/songusagereport.png'
Binary files manual/source/pics/songusagereport.png	1970-01-01 00:00:00 +0000 and manual/source/pics/songusagereport.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/startmenufolder.png'
Binary files manual/source/pics/startmenufolder.png	1970-01-01 00:00:00 +0000 and manual/source/pics/startmenufolder.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/svideo.png'
Binary files manual/source/pics/svideo.png	1970-01-01 00:00:00 +0000 and manual/source/pics/svideo.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/system_close.png'
Binary files manual/source/pics/system_close.png	1970-01-01 00:00:00 +0000 and manual/source/pics/system_close.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/system_configure.png'
Binary files manual/source/pics/system_configure.png	1970-01-01 00:00:00 +0000 and manual/source/pics/system_configure.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/system_edit_copy.png'
Binary files manual/source/pics/system_edit_copy.png	1970-01-01 00:00:00 +0000 and manual/source/pics/system_edit_copy.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/themeeditbutton.png'
Binary files manual/source/pics/themeeditbutton.png	1970-01-01 00:00:00 +0000 and manual/source/pics/themeeditbutton.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/themeimportexport.png'
Binary files manual/source/pics/themeimportexport.png	1970-01-01 00:00:00 +0000 and manual/source/pics/themeimportexport.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/thememanager.png'
Binary files manual/source/pics/thememanager.png	1970-01-01 00:00:00 +0000 and manual/source/pics/thememanager.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/thememanager1.png'
Binary files manual/source/pics/thememanager1.png	1970-01-01 00:00:00 +0000 and manual/source/pics/thememanager1.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/themewizard1.png'
Binary files manual/source/pics/themewizard1.png	1970-01-01 00:00:00 +0000 and manual/source/pics/themewizard1.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/themewizard2.png'
Binary files manual/source/pics/themewizard2.png	1970-01-01 00:00:00 +0000 and manual/source/pics/themewizard2.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/themewizard3.png'
Binary files manual/source/pics/themewizard3.png	1970-01-01 00:00:00 +0000 and manual/source/pics/themewizard3.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/themewizard4.png'
Binary files manual/source/pics/themewizard4.png	1970-01-01 00:00:00 +0000 and manual/source/pics/themewizard4.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/themewizard5.png'
Binary files manual/source/pics/themewizard5.png	1970-01-01 00:00:00 +0000 and manual/source/pics/themewizard5.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/themewizard6.png'
Binary files manual/source/pics/themewizard6.png	1970-01-01 00:00:00 +0000 and manual/source/pics/themewizard6.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/themewizard7.png'
Binary files manual/source/pics/themewizard7.png	1970-01-01 00:00:00 +0000 and manual/source/pics/themewizard7.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/themewizard8.png'
Binary files manual/source/pics/themewizard8.png	1970-01-01 00:00:00 +0000 and manual/source/pics/themewizard8.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/themewizard9.png'
Binary files manual/source/pics/themewizard9.png	1970-01-01 00:00:00 +0000 and manual/source/pics/themewizard9.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/themewizardwelcome.png'
Binary files manual/source/pics/themewizardwelcome.png	1970-01-01 00:00:00 +0000 and manual/source/pics/themewizardwelcome.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/twinview.png'
Binary files manual/source/pics/twinview.png	1970-01-01 00:00:00 +0000 and manual/source/pics/twinview.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/vga.png'
Binary files manual/source/pics/vga.png	1970-01-01 00:00:00 +0000 and manual/source/pics/vga.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/vistadisplaysettings.png'
Binary files manual/source/pics/vistadisplaysettings.png	1970-01-01 00:00:00 +0000 and manual/source/pics/vistadisplaysettings.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/vistapersonalize.png'
Binary files manual/source/pics/vistapersonalize.png	1970-01-01 00:00:00 +0000 and manual/source/pics/vistapersonalize.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/webbible1.png'
Binary files manual/source/pics/webbible1.png	1970-01-01 00:00:00 +0000 and manual/source/pics/webbible1.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/webbibleproxy1.png'
Binary files manual/source/pics/webbibleproxy1.png	1970-01-01 00:00:00 +0000 and manual/source/pics/webbibleproxy1.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/welcome.png'
Binary files manual/source/pics/welcome.png	1970-01-01 00:00:00 +0000 and manual/source/pics/welcome.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/winsevendisplay.png'
Binary files manual/source/pics/winsevendisplay.png	1970-01-01 00:00:00 +0000 and manual/source/pics/winsevendisplay.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/winsevenresolution.png'
Binary files manual/source/pics/winsevenresolution.png	1970-01-01 00:00:00 +0000 and manual/source/pics/winsevenresolution.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/xorgwrite.png'
Binary files manual/source/pics/xorgwrite.png	1970-01-01 00:00:00 +0000 and manual/source/pics/xorgwrite.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/xpdisplaysettings.png'
Binary files manual/source/pics/xpdisplaysettings.png	1970-01-01 00:00:00 +0000 and manual/source/pics/xpdisplaysettings.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/pics/zoombutton.png'
Binary files manual/source/pics/zoombutton.png	1970-01-01 00:00:00 +0000 and manual/source/pics/zoombutton.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/source/print_service.rst'
--- manual/source/print_service.rst	1970-01-01 00:00:00 +0000
+++ manual/source/print_service.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,345 @@
+=============
+Print Service 
+=============
+
+OpenLP provides the ability to print the service order. This can be useful for
+a variety of reasons, such as giving the printed service to your music team so
+they have the song order, or so pastors or speakers can have the flow of the
+service.
+
+To print your service go to :menuselection:`File --> Print Service` or press 
+:kbd:`Control + P`.
+
+.. image:: pics/printservice1.png
+
+This will bring up a window with the service order for review and printing.
+
+.. image:: pics/printservice2.png
+
+Toolbar
+-------
+
+|printbutton| **Print**
+  This will print the service bringing up the system's print options. Use
+  this when you are ready to print.
+
+|optionbutton| **Options** 
+  This gives you a series of ways to customize the service order before
+  printing. See the section on :ref:`options` for more information.
+
+|closebutton| **Close**
+  Closes the print service window.
+
+|copybutton| **Copy** 
+  Copy the text of the preview window to your clipboard. You can then paste the
+  text into other documents or applications.
+
+|copybutton| **Copy HTML** 
+  Copy html code to your clipboard. You can then paste this in a text editor
+  and save as .html. This can then be used to post your service details on a 
+  website or anywhere an html document can be used.
+
+|zoomin| **Zoom in**
+  Zooms in on your preview.
+
+|zoomout| **Zoom out**
+  Zooms out to make more of your preview visible.
+
+|zoomoriginal| **Zoom to original**
+  Restores the preview to its original size.
+
+.. _options:
+  
+Options
+-------
+
+.. image:: pics/printservice3.png
+
+**Title:**
+  Gives you the ability to change the title of the printed document.
+
+**Custom Footer Text:**
+  Add text to the footer of the printed document.
+
+**Other Options**
+
+**Include slide text if available**
+  Check this to include all the text from songs or scripture.
+
+**Add page break before each text item**
+  If you have checked *include slide text if available* you can select this
+  option to put each text item (songs, custom slides, scripture) on a
+  separate page.
+
+**Include service item notes**
+  This option will include any notes you have added to the service items.
+
+**Include play length of media items**
+  This option will print the length of media items in the service.
+
+Customizing with CSS (Advanced)
+-------------------------------
+
+It is possible to customize the printed service using CSS. To do this go to
+:menuselection:`Tools --> Open Data Folder` If you have a file named 
+servicePrint.css delete it. In the open folder create a file named 
+service_print.css containing your customizations. Paste the following into 
+service_print.css::
+
+	/*
+	Edit this service_print.css file to customize the service order print. Note, that not all CSS
+	properties are supported. See:
+	http://doc.trolltech.com/4.7/richtext-html-subset.html#css-properties
+	*/
+
+	.serviceTitle {
+	   font-weight:600;
+	   font-size:x-large;
+	   color:black;
+	}
+
+	.item {
+	   color:black;
+	}
+
+	.itemTitle {
+	   font-weight:600;
+	   font-size:large;
+	}
+
+	.itemText {}
+
+	.itemFooter {
+	   font-size:8px;
+	}
+
+	.itemNotes {}
+
+	.itemNotesTitle {
+	   font-weight:bold;
+	   font-size:12px;
+	}
+
+	.itemNotesText {
+	   font-size:11px;
+	}
+
+	.media {}
+
+	.mediaTitle {
+		font-weight:bold;
+		font-size:11px;
+	}
+
+	.mediaText {}
+
+	.imageList {}
+
+	.customNotes {
+	   margin-top: 10px;
+	}
+
+	.customNotesTitle {
+	   font-weight:bold;
+	   font-size:11px;
+	}
+
+	.customNotesText {
+	   font-size:11px;
+	}
+
+	.newPage {
+		page-break-before:always;
+	}
+
+
+The HTML layout should look something like this::
+
+	<html>
+	<head>
+	  <title>Service Order Sheet</title>
+	</head>
+	<body>
+	  <h1 class="serviceTitle">Service Order Sheet</h1>
+	  <div class="item">
+		<h2 class="itemTitle">
+		   <img src=":/plugins/plugin_songs.png">
+		   <span> Amazing Grace</span>
+		</h2>
+		<div class="itemText">
+		  <p>Amazing grace how sweet the sound that saved a wretch like me<br>
+		  I once was lost but now I'm found, was blind but now I see.</p>
+		</div>
+		<div class="itemText">
+		  <p>Twas grace that taught my heart to fear, and grace my fears relieved<br>
+		  How precious did that grace appear the hour I first believed!</p>
+		</div>
+		<div class="itemFooter">
+		  John Newton<br>
+		  1982 Jubilate Hymns Limited
+		</div>
+		<div class="itemNotes">
+		  <span class="itemNotesTitle">Notes:</span>
+		  <span class="itemNotesText">Song Notes<br>
+		  More Notes</span>
+		</div>
+	  </div>
+
+	  <div class="item newPage">
+		<h2 class="itemTitle">
+		   <img src=":/plugins/plugin_songs.png">
+		   <span> And Can It Be</span>
+		</h2>
+		<div class="itemText">
+		  <p>And can be that I should gain,<br>
+		  an interest in my Savior's blood?<br>
+		  Died He for me, who caused His pain?<br>
+		  For me, who Him to death pursued?<br>
+		  Amazing love, how can it be<br>
+		  That thou my Lord should die for me?</p>
+		</div>
+		<div class="itemText">
+		  <p>Amazing love, how can it be<br>
+		  That thou my God should die for me?</p>
+		</div>
+		<div class="itemFooter">
+		  Lindell Cooley<br>
+		  Public Domain
+		</div>
+	  </div>
+
+	  <div class="item">
+		<h2 class="itemTitle">
+		   <img src=":/plugins/plugin_media.png">
+		   <span> Wildlife.wmv</span>
+		</h2>
+		<div class="itemNotes">
+		  <span class="itemNotesTitle">Notes:</span>
+		  <span class="itemNotesText">Movie Notes</span>
+		</div>
+		<div class="media">
+		  <span class="mediaTitle">Playing time:</span>
+		  <span class="mediaText">0:00:00</span>
+		</div>
+	  </div>
+
+	  <div class="item newPage">
+		<h2 class="itemTitle">
+		   <img src=":/plugins/plugin_bibles.png">
+		   <span> John 3:16-17 (ASV)</span>
+		</h2>
+		<div class="itemText">
+		  <p><sup>3:16</sup> For God so loved the world, that he gave his only begotten Son, that whosoever believeth on him should not perish, but have eternal life.</p>
+		</div>
+		<div class="itemText">
+		  <p><sup>3:17</sup> For God sent not the Son into the world to judge the world; but that the world should be saved through him.</p>
+		</div>
+		<div class="itemFooter">
+		  ASV, Copyright, Permissions
+		</div>
+		<div class="itemNotes">
+		  <span class="itemNotesTitle">Notes:</span>
+		  <span class="itemNotesText">Bible reading notes</span>
+		</div>
+	  </div>
+
+	  <div class="item">
+		<h2 class="itemTitle">
+		   <img src=":/plugins/plugin_images.png">
+		   <span> Images</span>
+		</h2>
+		<ol class="imageList">
+		  <li>Winter.jpg</li>
+		  <li>Sunset.jpg</li>
+		</ol>
+		<div class="itemNotes">
+		  <span class="itemNotesTitle">Notes:</span>
+		  <span class="itemNotesText">Image notes</span>
+		</div>
+	  </div>
+
+	  <div class="item newPage">
+		<h2 class="itemTitle">
+		   <img src=":/plugins/plugin_custom.png">
+		   <span> Lord's Prayer Traditional</span>
+		</h2>
+		<div class="itemText">
+		  <p>Our Father,<br>
+		  who art in heaven,<br>
+		  hallowed be thy name.<br>
+		  Thy Kingdom come,<br>
+		  thy will be done,<br>
+		  on earth as it is in heaven</p>
+		</div>
+		<div class="itemText">
+		  <p>Give us this day our daily bread.<br>
+		  And forgive us our trespasses,<br>
+		  as we forgive those<br>
+		  who trespass against us.<br>
+		  And lead us not into temptation,<br>
+		  but deliver us from evil.<br>
+		  For thine is the kingdom,<br>
+		  the power and the glory,<br>
+		  for ever and ever. Amen</p>
+		</div>
+		<div class="itemNotes">
+		  <span class="itemNotesTitle">Notes:</span>
+		  <span class="itemNotesText">Custom Item Notes</span>
+		</div>
+	  </div>
+
+	  <div class="item">
+		<h2 class="itemTitle">
+		   <img src=":/plugins/plugin_presentations.png">
+		   <span> Sermon Presentation.pptx</span>
+		</h2>
+		<div class="itemNotes">
+		  <span class="itemNotesTitle">Notes:</span> 
+		  <span class="itemNotesText">Presentation notes</span>
+		</div>
+	  </div>
+
+	  <div class="customNotes">
+		<span class="customNotesTitle">Custom Service Notes:</span> 
+		<span class="customNotesText">Custom Footer Text Goes here like this</span>
+	  </div>
+	</body>
+	</html>
+
+Edit the CSS file to produce the required style.
+**Note:** not all CSS properties are supported. See
+`Qt4 CSS subset <http://doc.trolltech.com/4.7/richtext-html-subset.html#css-properties>`_
+for more information.
+
+**Example: Item titles with notes on right hand side**
+
+This service_print.css assumes the slide text will not be included.::
+
+	.itemTitle {
+	   font-weight:bold;
+	   font-size:large;
+	   margin: 0px;
+	}
+	.itemNotes {
+	   margin-left: 300px;
+	   margin-top: 0px;
+	}
+	.itemNotesTitle {
+	   font-weight:bold;
+	}
+
+.. The following section defines the inline pics
+
+.. |printbutton| image:: pics/general_print.png
+
+.. |optionbutton| image:: pics/system_configure.png
+
+.. |closebutton| image:: pics/system_close.png
+
+.. |copybutton| image:: pics/system_edit_copy.png
+
+.. |zoomout|  image:: pics/general_zoom_out.png
+
+.. |zoomin|  image:: pics/general_zoom_in.png
+
+.. |zoomoriginal|  image:: pics/general_zoom_original.png

=== added file 'manual/source/songs.rst'
--- manual/source/songs.rst	1970-01-01 00:00:00 +0000
+++ manual/source/songs.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,232 @@
+=====
+Songs 
+=====
+
+Managing your songs in OpenLP is a relatively simple process. There are also 
+converters provided to get data from other formats into OpenLP.
+
+Song Importer
+=============
+
+If you are using an earlier version of OpenLP or, come from another software 
+package, you may be able to convert your existing database to work in OpenLP
+2.0. To access the Song Importer click :menuselection:`File --> Import --> Song`.
+You will see the Song Importer window, then click :guilabel:`Next`.
+
+.. image:: pics/songimporter.png 
+
+After choosing :guilabel:`Next` you can select from the various types of 
+software that OpenLP will convert songs from.
+
+.. image:: pics/songimporterchoices.png
+
+Click on the file folder icon to choose the file of the song 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 database file.
+
+Windows XP::
+
+    C:\Documents and Settings\All Users\Application Data\openlp.org\Data\songs.olp
+
+Windows Vista / Windows 7::
+
+    C:\ProgramData\openlp.org\Data\songs.olp
+
+After clicking :guilabel:`Next` your conversion will be complete. 
+
+.. image:: pics/finishedimport.png
+
+Press :guilabel:`Finish` and you will now be ready to use your OpenLP 
+version 1 songs.
+
+Importing from OpenSong
+^^^^^^^^^^^^^^^^^^^^^^^
+
+Converting from OpenSong, you will need to locate your songs database. In the 
+later versions of OpenSong you are asked to define the location of this. The 
+songs will be located in a folder named :guilabel:`Songs`. This folder will
+contain files with all your songs in them, without a file extension. (file.xxx).
+When you have located this folder you will need to select the songs from
+the folder.
+
+.. image:: pics/selectsongs.png
+
+On most operating systems, to select all the songs, first select the first song
+in the list, press the shift key, and select the last song in the list. After
+this press :guilabel:`Next` and you will see that your import has been 
+successful.
+
+.. image:: pics/finishedimport.png
+
+Press :guilabel:`Finish` and OpenLP will be ready to use your songs that you
+imported from OpenSong.
+
+Importing from CCLI Song Select
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To import from CCLI Song Select you must be a CCLI Subscriber and also a 
+subscriber of the Song Select service. For more info check out the `CCLI website.
+<http://www.ccli.com>`_ 
+
+The first step for importing from CCLI Song Select is to log into your account.
+Then search for your desired song. For this example we will be adding the song
+"Amazing Grace". 
+
+.. image:: pics/songselectsongsearch.png
+
+For the song you are searching for, select `lyrics` This will take you to a 
+page displaying the lyrics and copyright information for your song.
+
+.. image:: pics/songselectlyrics.png
+
+Next, hover over the :guilabel:`Lyrics` menu from the upper right corner.
+Choose either the .txt or .usr file. You will be asked to chose a download
+location if your browser does not automatically select that for you. Select 
+this file from the OpenLP import window and then click :guilabel:`Next` You can
+also select multiple songs for import at once on most operating systems by 
+selecting the first item in the list then holding the shift key and select the
+last item in the list. When finished, you will see that your import has 
+completed.
+
+.. image:: pics/finishedimport.png
+
+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.

=== added file 'manual/source/system_requirements.rst'
--- manual/source/system_requirements.rst	1970-01-01 00:00:00 +0000
+++ manual/source/system_requirements.rst	2011-06-27 13:34:22 +0000
@@ -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
+  
\ No newline at end of file

=== added file 'manual/source/themes.rst'
--- manual/source/themes.rst	1970-01-01 00:00:00 +0000
+++ manual/source/themes.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,198 @@
+.. _themes:
+
+======
+Themes
+======
+
+
+The `Theme Manager` is where you can set backgrounds, fonts, and colors to the 
+style you desire. From the theme manager you can create a new theme, Edit a 
+theme, Delete a theme, Import a theme, and Export a theme.
+
+.. image:: /pics/thememanager1.png
+
+Creating New Themes
+===================
+Click the :guilabel:`Create Theme Icon` to Create a new theme   
+
+.. image:: /pics/createthemeicon.png 
+
+This will bring up the `Theme Wizard`
+
+.. image:: /pics/themewizardwelcome.png
+
+Click :guilabel:`Next`. You have 3 choices in the drop down menu for Background
+type: Solid Color, Gradient, or Image.
+
+.. image:: /pics/themewizard1.png 
+ 
+Solid color: select solid color and click on the black button next to Color. 
+You will have the option of choosing among the colors you see or entering your
+own.
+
+.. image:: /pics/themewizard2.png
+
+Gradient: choose the two colors, First and Second, you want to fade together 
+and the Gradient drop down will let you determine the directions of the fade.
+
+.. image:: /pics/themewizard3.png
+
+Image: Click on the folder to find and select your image. OpenLP accepts a 
+variety of image types. 
+
+.. image:: /pics/themewizard4.png
+
+**Note:** If possible, try to use the same size image as your projector is
+displaying.
+
+When finished with your selection for background, click the :guilabel:`Next`
+button. 
+
+This is the area where you will select and define your font characteristics for 
+the Display text.
+
+.. image:: /pics/themewizard5.png
+
+**Font:** Choose the font you would like to use from the drop down.
+
+**Color:** Choose the color of your font.
+
+**Size:** The size of your font determines how many lines are shown per slide.
+As you change the font size, the lines per slide will change.
+
+**Line Spacing:** This setting determines how much space you want between
+lines. This setting will also change the lines per slide. 
+
+**Outline:** If you desire an outline around your font, select the Outline box,
+choose your color and size of the outline.
+
+**Shadow:** If you desire a shadow around your font, select the Shadow box and 
+choose your color and size of the shadow.  
+
+**Bold Display:** select the box for Bold font
+
+**Italic Display:** select the box for Italic font
+
+When you are finished selecting your font details click the :guilabel:`Next`
+button.
+
+**Footer Area Font Details**
+
+This page determines the Font, Font Color, and size of the font for the footer.
+The footer is where the Title of the song, Author or Authors, Copyright and 
+CCLI License are displayed.
+
+.. image:: /pics/themewizard6.png
+
+When you are finished setting your footer font details, click :guilabel:`Next`.
+
+**Text Formatting Details**
+
+This page determines the alignment of the text on your slide and the transition 
+from one slide to the next. 
+
+.. image:: /pics/themewizard7.png
+
+**Horizontal Align** the text to the Left, Right or Center of the screen.
+
+**Vertical Align** the text to the Top, Middle or bottom of the screen.
+
+**Transitions**
+
+When this box is selected, switching slides will fade out from one and fade in 
+to the next. When the box is not selected, slide changing will be instant.
+
+When you are finished setting your Text Formatting Details, click :guilabel:`Next`.
+
+**Output Area Locations**
+
+This page gives you the ability to position your Main area or Footer area to a
+specific area of the screen using the x and y positions. ie: if you do not want
+your footer on the bottom left, you can make the adjustment here. 
+You can resize the Width and the Height of the Main Area and the Footer Area.
+ie: If you have a temporary or permanent obstacle in one part of the viewing
+area, you can resize the Main or Footer area and use x and y positions to
+display in a different position on the screen.
+
+.. image:: /pics/themewizard8.png
+
+You can also change the Width and the Height of the Main Area of the Footer Area.
+
+When you are finished setting your Output Area Locations, click :guilabel:`Next`.
+
+Save and Preview
+
+.. image:: /pics/themewizard9.png
+
+**Theme Name:** Enter your theme name here.
+
+**Preview** 
+The Preview shows the choices you made when setting up the previous pages plus, 
+shows all the edit effects possible so you can see what the impact is on all 
+possible font colors and characteristics.
+
+If you are satisfied with your selections, click :guilabel:`Finish`. If you 
+want to make a change, use the :guilabel:`Back` button.
+
+Editing Themes
+==============
+Now that you created your theme, and you show it on the projector and there is
+something you don't like, you can easily Edit your theme either by clicking the
+Theme Edit Button:
+
+.. image:: /pics/themeeditbutton.png
+
+Or by right-clicking your theme and selecting the appropriate action.
+
+Deleting Themes
+===============
+
+The Delete Button:
+
+.. image:: /pics/songs17.png
+
+will delete a selected theme or by right-clicking your theme and selecting 
+the appropriate action.
+
+**Note:** deleting the currently selected global theme or the 
+default theme is not possible.
+
+Exporting Themes
+================
+If you would like to transfer a theme from one computer to another, click on 
+the theme you want to Export, click the last button in the Theme Manager:
+
+.. image:: /pics/themeimportexport.png
+
+choose the folder you want to save your theme and click the OK button.
+
+Importing Themes
+================
+
+The fourth button in the Theme Manager:
+
+.. image:: /pics/themeimportexport.png
+
+will allow you to Import an Exported theme. Click the Import button, select the
+folder and the theme file, and click OK. Your imported theme will be in the 
+Theme Manager. Import Theme will also handle version 1 Exports. You will need to
+check your imported theme since many of the values will have been defaulted.
+
+Rename Theme
+============
+
+If you created a theme and want to change the name of it, right-click your
+theme and click Rename theme and enter the new name.
+
+Copy Theme
+==========
+
+Now that you created a theme with all the attributes you like, you can
+right-click the theme, click on Copy theme, choose your new name and click OK.
+You now have a duplicate of your first theme that you can edit the way you want.
+
+Set as Global default
+=====================
+
+If you right-click your theme, you have the option to set the theme as Global
+default. This option is covered in greater detail under “Configure OpenLP. 

=== added file 'manual/source/troubleshooting.rst'
--- manual/source/troubleshooting.rst	1970-01-01 00:00:00 +0000
+++ manual/source/troubleshooting.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,202 @@
+===============
+Troubleshooting
+===============
+
+.. _t-no-media:
+
+I can not play videos or other media
+------------------------------------
+
+If you can not play video or audio through openlp, there are several areas that
+could be an issue. First thing is to make sure you can play the media file
+through your default media player. OpenLP should be able to play any file that
+you can play through your default media player.
+
+If you can play a file through your media player but not on OpenLP it may help
+to enable Phonon for multimedia playback. Go to the OpenLP configuration
+:menuselection:`Settings --> Configure OpenLP...` and select the Media tab.
+Make sure the check box for `Use Phonon for video playback` is checked.
+
+.. image:: pics/phononcheckbox.png
+
+Codecs
+^^^^^^
+
+You may need to install codecs for certain files to play. Most newer versions
+of Windows and OS X will support most media types. Most Linux distributions
+will require a little more help to get certain media types to play.
+
+Microsoft Windows
+^^^^^^^^^^^^^^^^^
+
+Later versions of Microsoft Windows (Vista, Windows 7) generally come with
+everything you need to play most media formats. If for some reason you need
+additional codecs we have seen success from the `Combined Community Codec Pack
+(CCCP) <http://www.cccp-project.net/>`_.  You might also wish to check out the
+K-Lite Codec Pack. If you are having issues, results do seem to vary with the
+different options. What works for some may not for others, so some trial and
+error may be required.
+
+Mac
+^^^
+
+If you are using a Mac. You may wish to play Windows formats. flip4mac enables
+you to use popular Windows formats such as .wmv on your Mac. You can get it
+`from here <http://dynamic.telestream.net/downloads/download-flip4macwmv.htm>`_.
+
+Ubuntu Linux (and variants)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+If you are using Ubuntu Linux, or one of its variants (Kubuntu, Edubuntu, etc...)
+it is a fairly quick and easy process to get all the codecs you need to make
+things work. You will need to install two meta-packages that contain all the
+multimedia codecs that you will generally need. From the Software Center install
+ubuntu-restricted-extras and Kubuntu-restricted-extras, or from the terminal::
+
+  user@linux:~ $ sudo apt-get install ubuntu-restricted-extras kubuntu-restricted-extras
+
+**Note** if you are running Kubuntu there is no need to install the
+ubuntu-restricted-extras meta-package
+
+For more information on Ubuntu and multimedia issues please check out the
+`community documentation <https://help.ubuntu.com/community/RestrictedFormats/>`_.
+
+Arch Linux
+^^^^^^^^^^
+
+The following command provides the most complete solution for codecs on Arch
+Linux::
+
+  root@linux:~ # pacman -S gstreamer0.10-{base,good,bad,ugly}-plugins gstreamer0.10-ffmpeg
+
+If you need more help with Arch Linux and multimedia please see the `Arch Linux
+documentation <https://wiki.archlinux.org/index.php/Codecs>`_.
+
+Debian Linux
+^^^^^^^^^^^^
+
+You will need to add the Debian Multimedia Repository. So add the folowing to
+/etc/apt/sources.list::
+
+  deb http://www.debian-multimedia.org testing main non-free
+
+Then update the repository info::
+
+  root@linux:~ # apt-get update
+
+Then install the following packages::
+
+  root@linux:~ # apt-get install gstreamer0.10-ffmpeg gstreamer0.10-lame gstreamer0.10-plugins-really-bad gstreamer0.10-plugins-bad gstreamer0.10-plugins-ugly gstreamer0.10-plugins-good gstreamer0.10-x264
+
+Fedora Linux
+^^^^^^^^^^^^
+You will need to set up Fedora to play most media formats. This is relatively
+simple using the rpmfusion repository.
+
+**Note** the following commands will enable a third party repository to your
+system. Please check out `the RPM Fusion site <http://rpmfusion.org>`_ for more information.
+
+To enable both the free and nonfree components for any Fedora official release
+enter the following commands::
+
+  su -c 'yum localinstall --nogpgcheck http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-stable.noarch.rpm http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-stable.noarch.rpm'
+
+After enabling the rpmfusion repository you will want to refresh your package
+list, perform any updates and search for gstreamer-good, bad, and ugly and
+install.
+
+Follow the tutorial `using the rpmfusion repository <http://www.linuxjournal.com/video/getting-mp3-support-fedora-using-rpmfusion-repositories>`_
+to enable extra audio and video formats on Fedora
+
+.. _t-no-media-items:
+
+The Media Manager appears to be missing some features
+-----------------------------------------------------
+
+If you do not see all the features listed in the Media Manager, you may need
+to enable them.
+
+To enable the plugins navigate to :menuselection:`Settings --> Plugins` or
+press :kbd:`Alt+F7`. You will want to click on the plugin to the left that you
+would like to enable and select **active** from the drop down box to the right.
+
+.. image:: pics/plugins.png
+
+By default all plugins should be enabled during the first run wizard except the
+remotes plugin, unless you specify differently.
+
+I can not see the book, chapter, and verse when I display scripture
+-------------------------------------------------------------------
+
+The book, chapter, and verse should be displayed when you display scripture. If
+you can not see this your theme probably has the text size too small for the
+info to be seen. See the section of the manual on :ref:`themes` if you need more info
+on text sizes in themes.
+
+I am running Mac OS X and I do not have a presentations plugin
+--------------------------------------------------------------
+
+Due to software limitations with Keynote and OpenOffice Impress, the
+presentations plugin on OS X is not currently available.
+
+I am using PowerPoint 2010 or PowerPoint Viewer 2010 and presentations do not work
+----------------------------------------------------------------------------------
+
+Currently OpenLP does not support PowerPoint Viewer 2010. PowerPoint 2010 should
+work correctly, although some users have reported problems. If you have issues
+with PowerPoint 2010 or PowerPoint Viewer 2010 try the PowerPoint 2003 or 2007
+Viewers. `Download the PowerPoint 2007 viewer for free
+<http://www.microsoft.com/downloads/en/details.aspx?FamilyID=048dc840-14e1-467d-8dca-19d2a8fd7485&displaylang=en>`_.
+
+I have PowerPoint installed but it does not show as a presentation option
+-------------------------------------------------------------------------
+
+Installing the `Visual C++ Runtime Redistributable. <http://www.microsoft.com/downloads/en/details.aspx?FamilyID=9b2da534-3e03-4391-8a4d-074b9f2bc1bf&displaylang=en>`_
+has fixed this problem according to some of our users.
+
+I have JPG images and they will not work on my system
+-----------------------------------------------------
+
+This is a known issue on some Mac OS X 10.5 systems and on a few Windows XP
+systems. Currently the only solution is to convert your images into another
+format. We would suggest using PNG images when possible with OpenLP.
+
+I am running a Linux Distro and can not see the menus
+-----------------------------------------------------
+
+This seems to be a problem with XFCE and some versions of Gnome too. To correct
+this problem, open  a terminal and type in the following commands::
+
+  gconftool-2 --type boolean --set /desktop/gnome/interface/buttons_have_icons true
+
+  gconftool-2 --type boolean --set /desktop/gnome/interface/menus_have_icons true
+
+I chose to use a web Bible but it did not download the entire Bible
+-------------------------------------------------------------------
+
+Due to copyright restrictions OpenLP cannot download an entire Bible. It can
+only download the section you search for. If you do not have an internet
+connection where you intend to use OpenLP you will need another scripture
+source. For more information about acquiring Bibles please see the section on
+the :ref:`bibles-import`.
+
+OpenLP is using a large amount of RAM when showing a presentation
+-----------------------------------------------------------------
+
+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.
+
+OpenLP is not displaying correctly, or is not on the correct screen
+-------------------------------------------------------------------
+
+Please read the documentation on :ref:`dualmonitors`. It is very important to
+have dual monitors setup properly for OpenLP to function as expected.
+
+
+

=== added file 'manual/source/wizard.rst'
--- manual/source/wizard.rst	1970-01-01 00:00:00 +0000
+++ manual/source/wizard.rst	2011-06-27 13:34:22 +0000
@@ -0,0 +1,102 @@
+================
+First Run Wizard
+================
+
+When using OpenLP for the first time, the **First Run Wizard** will help you 
+with setting up your installation. This wizard is not intended to be a 
+comprehensive setup but will help you with the basics.
+
+Select Translation
+------------------
+
+.. image:: pics/001-first-time-language.png
+
+You can choose the translation you want to use or let OpenLP 
+automatically select it based on your operating system locale. Click 
+:guilabel:`OK` to continue.
+
+The "Welcome to the First Time Wizard" dialog box will appear next. Click 
+:guilabel:`Next`.
+
+.. image:: pics/002-first-time-wizard-welcome.png
+
+Activate required Plugins
+-------------------------
+
+.. image:: pics/003-first-time-wizard-plugins.png
+
+OpenLP has several plugins to choose from. By default, all plugins are enabled, 
+except the *Remote Access* plugin. For more information on these plugins, please 
+read the :doc:`mediamanager` section in the manual. If you are not sure of which 
+plugins to enable or disable, leave the selection as is. You can easily activate 
+or deactivate plugins later, when OpenLP is running, by going to 
+:menuselection:`Settings --> Plugin List`. Click :guilabel:`Next` to continue.
+
+Sample Songs
+------------
+
+.. image:: pics/004-first-time-wizard-songs.png
+
+OpenLP provides some sample songs in a few languages for downloading and 
+importing into your new song database. This is convenient for new users who do 
+not have any songs yet. If you already have songs in your database, OpenLP will 
+simply add these sample songs to your database, leaving your existing songs 
+intact. Once you are happy with which songs you'd like, click :guilabel:`Next`.
+
+Sample Bibles
+-------------
+
+.. image:: pics/005-first-time-wizard-bibles.png
+
+There are also a number of free Bibles that you can download and install. Using 
+the check box next to each Bible, select each Bible that you would like 
+installed. If you do not wish to install any Bibles, simply leave them all 
+unchecked. Once you are happy with your selection, click :guilabel:`Next` to 
+continue.
+
+Sample Themes
+-------------
+
+.. image:: pics/006-first-time-wizard-themes.png
+
+Some sample themes are also available for download and installation into OpenLP. 
+As with the Bibles, simply check the check box next to each theme to select it. 
+If you are a new user, these themes can help you understand how themes work. If 
+you are happy with your selected themes, click :guilabel:`Next` to continue.
+
+Default Settings
+----------------
+
+.. image:: pics/007-first-time-wizard-settings.png
+
+Default Display Monitor
+^^^^^^^^^^^^^^^^^^^^^^^
+
+Screen 2. If you are installing OpenLP but are not connected to a second output 
+at the time, you can set this up later by going to 
+:menuselection:`Settings --> Configure OpenLP`.
+
+Default Theme
+^^^^^^^^^^^^^
+
+If you have selected one or more themes on the themes page of the wizard, you 
+can select which theme you'd like to be the default theme.
+
+If you are happy with the selections you have made, click :guilabel:`Next` to 
+continue to the next page.
+
+.. image:: pics/009-first-time-wizard-progress.png
+
+Making progress.
+
+.. image:: pics/010-first-time-wizard-finished.png
+
+On the last page of the wizard, OpenLP will download the sample songs, Bibles 
+and themes, and set up OpenLP for you. Click :guilabel:`Finish` and OpenLP will 
+start.
+
+.. image:: pics/011-first-time-wizard-song-import.png
+
+The main window.
+
+.. image:: pics/012-openlp-main-window.png

=== added directory 'manual/themes'
=== added directory 'manual/themes/openlp_qthelp'
=== added file 'manual/themes/openlp_qthelp/layout.html'
--- manual/themes/openlp_qthelp/layout.html	1970-01-01 00:00:00 +0000
+++ manual/themes/openlp_qthelp/layout.html	2011-06-27 13:34:22 +0000
@@ -0,0 +1,68 @@
+{#
+    openlp_qthelp/layout.html
+    ~~~~~~~~~~~~~~~~~
+
+    Sphinx layout template for the openlp_qthelp theme.
+
+    :copyright: Copyright 2004-2010 Raoul Snyman.
+    :license: GPL
+#}
+{% extends "basic/layout.html" %}
+{% set script_files = script_files + ['_static/theme_extras.js'] %}
+{% set css_files = css_files + ['_static/print.css'] %}
+
+{# do not display relbars #}
+{% block relbar1 %}{% endblock %}
+{% block relbar2 %}{% endblock %}
+
+{% macro nav() %}
+        <p>
+        {%- block openlp_qthelprel1 %}
+        {%- endblock %}
+        {%- if prev %}
+        «&#160;&#160;<a href="{{ prev.link|e }}">{{ prev.title }}</a>
+        &#160;&#160;::&#160;&#160;
+        {%- endif %}
+        <a class="uplink" href="{{ pathto(master_doc) }}">{{ _('Contents') }}</a>
+        {%- if next %}
+        &#160;&#160;::&#160;&#160;
+        <a href="{{ next.link|e }}">{{ next.title }}</a>&#160;&#160;»
+        {%- endif %}
+        {%- block openlp_qthelprel2 %}
+        {%- endblock %}
+        </p>
+{% endmacro %}
+
+{% block content %}
+      <!-- div class="header">
+        {%- block openlp_qthelpheader %}
+        {%- if theme_full_logo != "false" %}
+        <a href="{{ pathto('index') }}">
+          <img class="logo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo"/>
+        </a>
+        {%- else %}
+        {%- if logo -%}
+          <img class="rightlogo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo"/>
+        {%- endif -%}
+        <h1 class="heading"><a href="{{ pathto('index') }}">
+          <span>{{ shorttitle|e }}</span></a></h1>
+        <h2 class="heading"><span>{{ title|striptags|e }}</span></h2>
+        {%- endif %}
+        {%- endblock %}
+      </div -->
+      <div class="topnav">
+      {{ nav() }}
+      </div>
+      <div class="content">
+        {#{%- if display_toc %}
+        <div id="toc">
+          <h3>Table Of Contents</h3>
+          {{ toc }}
+        </div>
+        {%- endif %}#}
+        {% block body %}{% endblock %}
+      </div>
+      <div class="bottomnav">
+      {{ nav() }}
+      </div>
+{% endblock %}

=== added directory 'manual/themes/openlp_qthelp/static'
=== added file 'manual/themes/openlp_qthelp/static/alert_info_32.png'
Binary files manual/themes/openlp_qthelp/static/alert_info_32.png	1970-01-01 00:00:00 +0000 and manual/themes/openlp_qthelp/static/alert_info_32.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/themes/openlp_qthelp/static/alert_warning_32.png'
Binary files manual/themes/openlp_qthelp/static/alert_warning_32.png	1970-01-01 00:00:00 +0000 and manual/themes/openlp_qthelp/static/alert_warning_32.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/themes/openlp_qthelp/static/bg-page.png'
Binary files manual/themes/openlp_qthelp/static/bg-page.png	1970-01-01 00:00:00 +0000 and manual/themes/openlp_qthelp/static/bg-page.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/themes/openlp_qthelp/static/bullet_orange.png'
Binary files manual/themes/openlp_qthelp/static/bullet_orange.png	1970-01-01 00:00:00 +0000 and manual/themes/openlp_qthelp/static/bullet_orange.png	2011-06-27 13:34:22 +0000 differ
=== added file 'manual/themes/openlp_qthelp/static/openlp_qthelp.css_t'
--- manual/themes/openlp_qthelp/static/openlp_qthelp.css_t	1970-01-01 00:00:00 +0000
+++ manual/themes/openlp_qthelp/static/openlp_qthelp.css_t	2011-06-27 13:34:22 +0000
@@ -0,0 +1,372 @@
+/*
+ * openlp_qthelp.css_t
+ * ~~~~~~~~~~~
+ *
+ * Sphinx stylesheet -- openlp_qthelp theme.
+ *
+ * Adapted from http://openlp_qthelp-os.org/docs/Haiku-doc.css.
+ * Original copyright message:
+ *
+ *     Copyright 2008-2009, Haiku. All rights reserved.
+ *     Distributed under the terms of the MIT License.
+ *
+ *     Authors:
+ *              Francois Revol <revol@xxxxxxx>
+ *              Stephan Assmus <superstippi@xxxxxx>
+ *              Braden Ewing <brewin@xxxxxxxxx>
+ *              Humdinger <humdingerb@xxxxxxxxx>
+ *
+ * :copyright: Copyright 2007-2010 by the Sphinx team, see AUTHORS.
+ * :license: BSD, see LICENSE for details.
+ *
+ */
+
+@import url("basic.css");
+
+html {
+    margin: 0px;
+    padding: 0px;
+    background-color: #fff;
+    background-image: none;
+}
+
+body {
+    line-height: 1.5;
+    margin: auto;
+    padding: 0px;
+    font-family: "DejaVu Sans", Arial, Helvetica, sans-serif;
+    min-width: 59em;
+    max-width: 70em;
+    color: {{ theme_textcolor }};
+}
+
+div.footer {
+    padding: 8px;
+    font-size: 11px;
+    text-align: center;
+    letter-spacing: 0.5px;
+}
+
+/* link colors and text decoration */
+
+a:link {
+    font-weight: bold;
+    text-decoration: none;
+    color: {{ theme_linkcolor }};
+}
+
+a:visited {
+    font-weight: bold;
+    text-decoration: none;
+    color: {{ theme_visitedlinkcolor }};
+}
+
+a:hover, a:active {
+    text-decoration: underline;
+    color: {{ theme_hoverlinkcolor }};
+}
+
+/* Some headers act as anchors, don't give them a hover effect */
+
+h1 a:hover, a:active {
+    text-decoration: none;
+    color: {{ theme_headingcolor }};
+}
+
+h2 a:hover, a:active {
+    text-decoration: none;
+    color: {{ theme_headingcolor }};
+}
+
+h3 a:hover, a:active {
+    text-decoration: none;
+    color: {{ theme_headingcolor }};
+}
+
+h4 a:hover, a:active {
+    text-decoration: none;
+    color: {{ theme_headingcolor }};
+}
+
+a.headerlink {
+    color: #a7ce38;
+    padding-left: 5px;
+}
+
+a.headerlink:hover {
+    color: #a7ce38;
+}
+
+/* basic text elements */
+
+div.content {
+    margin-top: 20px;
+    margin-left: 40px;
+    margin-right: 40px;
+    margin-bottom: 50px;
+    font-size: 0.9em;
+}
+
+/* heading and navigation */
+
+div.header {
+    position: relative;
+    left: 0px;
+    top: 0px;
+    height: 85px;
+    /* background: #eeeeee; */
+    padding: 0 40px;
+}
+div.header h1 {
+    font-size: 1.6em;
+    font-weight: normal;
+    letter-spacing: 1px;
+    color: {{ theme_headingcolor }};
+    border: 0;
+    margin: 0;
+    padding-top: 15px;
+}
+div.header h1 a {
+    font-weight: normal;
+    color: {{ theme_headingcolor }};
+}
+div.header h2 {
+    font-size: 1.3em;
+    font-weight: normal;
+    letter-spacing: 1px;
+    text-transform: uppercase;
+    color: #aaa;
+    border: 0;
+    margin-top: -3px;
+    padding: 0;
+}
+
+div.header img.rightlogo {
+    float: right;
+}
+
+
+div.title {
+    font-size: 1.3em;
+    font-weight: bold;
+    color: {{ theme_headingcolor }};
+    border-bottom: dotted thin #e0e0e0;
+    margin-bottom: 25px;
+}
+div.topnav {
+    /* background: #e0e0e0; */
+}
+div.topnav p {
+    margin-top: 0;
+    margin-left: 40px;
+    margin-right: 40px;
+    margin-bottom: 0px;
+    text-align: right;
+    font-size: 0.8em;
+}
+div.bottomnav {
+    background: #eeeeee;
+}
+div.bottomnav p {
+    margin-right: 40px;
+    text-align: right;
+    font-size: 0.8em;
+}
+
+a.uplink {
+    font-weight: normal;
+}
+
+
+/* contents box */
+
+table.index {
+    margin: 0px 0px 30px 30px;
+    padding: 1px;
+    border-width: 1px;
+    border-style: dotted;
+    border-color: #e0e0e0;
+}
+table.index tr.heading {
+    background-color: #e0e0e0;
+    text-align: center;
+    font-weight: bold;
+    font-size: 1.1em;
+}
+table.index tr.index {
+    background-color: #eeeeee;
+}
+table.index td {
+    padding: 5px 20px;
+}
+
+table.index a:link, table.index a:visited {
+    font-weight: normal;
+    text-decoration: none;
+    color: {{ theme_linkcolor }};
+}
+table.index a:hover, table.index a:active {
+    text-decoration: underline;
+    color: {{ theme_hoverlinkcolor }};
+}
+
+
+/* Haiku User Guide styles and layout */
+
+/* Rounded corner boxes */
+/* Common declarations */
+div.admonition {
+    -webkit-border-radius: 10px;
+    -khtml-border-radius: 10px;
+    -moz-border-radius: 10px;
+    border-radius: 10px;
+    border-style: dotted;
+    border-width: thin;
+    border-color: #dcdcdc;
+    padding: 10px 15px 10px 15px;
+    margin-bottom: 15px;
+    margin-top: 15px;
+}
+div.note {
+    padding: 10px 15px 10px 80px;
+    background: #e4ffde url(alert_info_32.png) 15px 15px no-repeat;
+    min-height: 42px;
+}
+div.warning {
+    padding: 10px 15px 10px 80px;
+    background: #fffbc6 url(alert_warning_32.png) 15px 15px no-repeat;
+    min-height: 42px;
+}
+div.seealso {
+    background: #e4ffde;
+}
+
+/* More layout and styles */
+h1 {
+    font-size: 1.3em;
+    font-weight: bold;
+    color: {{ theme_headingcolor }};
+    border-bottom: dotted thin #e0e0e0;
+    margin-top: 30px;
+}
+
+h2 {
+    font-size: 1.2em;
+    font-weight: normal;
+    color: {{ theme_headingcolor }};
+    border-bottom: dotted thin #e0e0e0;
+    margin-top: 30px;
+}
+
+h3 {
+    font-size: 1.1em;
+    font-weight: normal;
+    color: {{ theme_headingcolor }};
+    margin-top: 30px;
+}
+
+h4 {
+    font-size: 1.0em;
+    font-weight: normal;
+    color: {{ theme_headingcolor }};
+    margin-top: 30px;
+}
+
+p {
+    text-align: justify;
+}
+
+p.last {
+    margin-bottom: 0;
+}
+
+ol {
+    padding-left: 20px;
+}
+
+ul {
+    padding-left: 5px;
+    margin-top: 3px;
+}
+
+li {
+    line-height: 1.3;
+}
+
+div.content ul > li {
+    -moz-background-clip:border;
+    -moz-background-inline-policy:continuous;
+    -moz-background-origin:padding;
+    background: transparent url(bullet_orange.png) no-repeat scroll left 0.45em;
+    list-style-image: none;
+    list-style-type: none;
+    padding: 0 0 0 1.666em;
+    margin-bottom: 3px;
+}
+
+td {
+    vertical-align: top;
+}
+
+tt {
+    background-color: #e2e2e2;
+    font-size: 1.0em;
+    font-family: monospace;
+}
+
+pre {
+    border-color: #0c3762;
+    border-style: dotted;
+    border-width: thin;
+    margin: 0 0 12px 0;
+    padding: 0.8em;
+    background-color: #f0f0f0;
+}
+
+hr {
+    border-top: 1px solid #ccc;
+    border-bottom: 0;
+    border-right: 0;
+    border-left: 0;
+    margin-bottom: 10px;
+    margin-top: 20px;
+}
+
+/* printer only pretty stuff */
+@media print {
+    .noprint {
+        display: none;
+    }
+    /* for acronyms we want their definitions inlined at print time */
+    acronym[title]:after {
+        font-size: small;
+        content: " (" attr(title) ")";
+        font-style: italic;
+    }
+    /* and not have mozilla dotted underline */
+    acronym {
+        border: none;
+    }
+    div.topnav, div.bottomnav, div.header, table.index {
+        display: none;
+    }
+    div.content {
+        margin: 0px;
+        padding: 0px;
+    }
+    html {
+        background: #FFF;
+    }
+}
+
+.viewcode-back {
+    font-family: "DejaVu Sans", Arial, Helvetica, sans-serif;
+}
+
+div.viewcode-block:target {
+    background-color: #f4debf;
+    border-top: 1px solid #ac9;
+    border-bottom: 1px solid #ac9;
+    margin: -1px -12px;
+    padding: 0 12px;
+}

=== added file 'manual/themes/openlp_qthelp/theme.conf'
--- manual/themes/openlp_qthelp/theme.conf	1970-01-01 00:00:00 +0000
+++ manual/themes/openlp_qthelp/theme.conf	2011-06-27 13:34:22 +0000
@@ -0,0 +1,12 @@
+[theme]
+inherit = basic
+stylesheet = openlp_qthelp.css
+pygments_style = autumn
+
+[options]
+full_logo         = false
+textcolor         = #333333
+headingcolor      = #203b6f
+linkcolor         = #26437c
+visitedlinkcolor  = #26437c
+hoverlinkcolor    = #26437c

=== added file 'plugin.txt'
--- plugin.txt	1970-01-01 00:00:00 +0000
+++ plugin.txt	2011-06-27 13:34:22 +0000
@@ -0,0 +1,97 @@
+A plugin architecture for openlp 2.0
+------------------------------------
+
+Why?
+----
+To allow easy development of new "things to display". Examples:
+* Bible passages
+* Video
+* Powerpoint/Openoffice Impress
+* Lyrics :) (with chords, rich text, etc...)
+* Musical score
+* Midi files (hmmm, that's not a thing to display, but feels like it should be
+  there...)
+* Audio files, CDs (hmmm again)
+* Collections of pictures
+* Alerts to members of the congregation
+... etc.
+
+The scope of these plugins is "things for display purposes", so each needs to
+be able to:
+* Render their display (on the projection screen and in a "shrunken form"
+  for preview purposes)
+
+These plugins need to be part of a service.  This means they need to 
+* Be able to tell the service manager code what to put in the service for their
+  "bit"
+* Have a "tab" in the media manager, which they can render on request
+  to allow bits to be added to the service (or indeed shown live)
+
+In addition, some plugins need to be able to show
+* How their multiple screens of data are split (eg verses)
+* be told which screen to display
+
+Some plugins will also have things to configure, so will need
+* to tell the core app that they need a preferences page
+* and be able to render it and handle those prefs
+
+Some plugins may need to define
+* Hot keys for their display actions.  The core will have to pass these on...
+
+Other basic things all plugins will need:
+* A name
+* A version number
+* Helpfile?
+
+Funnily enough, the core lyrics engine fits those requirements, so could
+actually form a plugin...
+
+Each service entry may be made up of multiple plugins (to do text on video), so
+each plugin that contributes to a service item will need a "layering"
+priority.
+
+Plugin management
+-----------------
+
+Plugins will be packages within the plugins/ directory.  The plugin manager
+will scan this directory when openlp loads for any class which is based on the
+base Plugin class (or should we call it the DisplayPlugin class to allow for
+other sorts??)
+
+These plugins are then queried for their capabilities/requirements and
+spaces made in the prefs UI as required, and in the media manager.
+
+The service manager can find out what plugins it has available (we need to
+report missing plugins when a service is loaded).
+
+The display manager will get a ref to a/some plugin(s) from the service
+manager when each service item is made live, and can then call on each to
+render their display.
+
+Each plugin will have basic attributes for 
+* name
+* version number 
+* capabilities/requirements 
+  (eg:
+  needs a prefs page, 
+  needs key presses forwarding
+  has multiple screensful?
+  )
+
+and a set of API functions for
+* media manager rendering and handling
+* creating service data
+* being told service data
+* set paint context
+* render
+* selecting a screen to display
+* handling preferences
+* shortcut key handling...
+
+
+Other things to add:
+Multiple monitors
+Openoffice like plugins  - external rendering.
+update hook for rendering?
+Event hook from app
+Event hook to app (MIDI events....)


Follow ups