From 6109a22101fcc20a3a988246314fea0966aec7de Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul.snyman@saturnlaboratories.co.za>
Date: Wed, 13 Jun 2012 19:23:12 +0200
Subject: [PATCH 1/3] Fixed the path to the code.

---
 api/source/conf.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/api/source/conf.py b/api/source/conf.py
index 8c78b0f..3046109 100644
--- a/api/source/conf.py
+++ b/api/source/conf.py
@@ -17,7 +17,9 @@ 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('..', '..', '..')))
+path_to_code = os.path.abspath(os.path.join(os.path.split(__file__)[0],
+    '..', '..', '..', '..', 'OpenLP', 'trunk'))
+sys.path.insert(0, path_to_code)
 
 # -- General configuration -----------------------------------------------------
 

From 3d0365b555dcf2aa4909deeab46c481d2010d0c3 Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul.snyman@saturnlaboratories.co.za>
Date: Wed, 13 Jun 2012 19:34:02 +0200
Subject: [PATCH 2/3] Migrated some fixes from an older version of this branch.

---
 api/source/core/index.rst    | 13 ++++++++-----
 api/source/plugins/media.rst | 10 +++++-----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/api/source/core/index.rst b/api/source/core/index.rst
index 8555e1e..820cb1e 100644
--- a/api/source/core/index.rst
+++ b/api/source/core/index.rst
@@ -1,10 +1,10 @@
 .. _core-index:
 
-:mod:`core` Module
-==================
+Core Application
+================
 
-.. automodule:: openlp.core
-   :members:
+This is the core of the OpenLP application. Anything that is not a plugin is
+stored in the :mod:`~openlp.core` module.
 
 .. toctree::
    :maxdepth: 2
@@ -12,4 +12,7 @@
    lib
    theme
    ui
-   utils
\ No newline at end of file
+   utils
+
+.. automodule:: openlp.core
+   :members:
diff --git a/api/source/plugins/media.rst b/api/source/plugins/media.rst
index e5a49db..a8486c9 100644
--- a/api/source/plugins/media.rst
+++ b/api/source/plugins/media.rst
@@ -6,17 +6,17 @@ Media Plugin
 .. automodule:: openlp.plugins.media
    :members:
 
-  Plugin Class
-  ------------
+Plugin Class
+------------
 
 .. autoclass:: openlp.plugins.media.mediaplugin.MediaPlugin
    :members:
 
-  Helper Classes & Functions
-  --------------------------
+Helper Classes & Functions
+--------------------------
 
 .. automodule:: openlp.plugins.media.lib
    :members:
 
-  .. automodule:: openlp.plugins.media.lib.mediaitem
+.. automodule:: openlp.plugins.media.lib.mediaitem
    :members:

From 34bbe4f4264b82f56e4c2d8ea1f8cf0dd4b50442 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Fri, 15 Jun 2012 07:01:35 +0100
Subject: [PATCH 3/3] Update

bzr-revno: 101
---
 api/source/conf.py              | 2 +-
 api/source/plugins/songs.rst    | 6 +++---
 manual/Makefile                 | 2 +-
 manual/source/alert.rst         | 2 ++
 manual/source/custom_slides.rst | 2 ++
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/api/source/conf.py b/api/source/conf.py
index 8c78b0f..401764f 100644
--- a/api/source/conf.py
+++ b/api/source/conf.py
@@ -39,7 +39,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'OpenLP'
-copyright = u'2004-2011, Raoul Snyman'
+copyright = u'2004-2012, 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
diff --git a/api/source/plugins/songs.rst b/api/source/plugins/songs.rst
index a9a3a82..5451a8c 100644
--- a/api/source/plugins/songs.rst
+++ b/api/source/plugins/songs.rst
@@ -48,9 +48,6 @@ Helper Classes & Functions
 .. automodule:: openlp.plugins.songs.lib.db
    :members:
 
-.. automodule:: openlp.plugins.songs.lib.importer
-   :members:
-
 .. automodule:: openlp.plugins.songs.lib.mediaitem
    :members:
 
@@ -63,6 +60,9 @@ Helper Classes & Functions
 .. automodule:: openlp.plugins.songs.lib.xml
    :members:
 
+.. automodule:: openlp.plugins.songs.lib.upgrade
+   :members:
+
 Song Importers
 --------------
 
diff --git a/manual/Makefile b/manual/Makefile
index 70c8211..aa8e5f4 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -9,7 +9,7 @@ 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
+ALLSPHINXOPTS   = -n -d build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
 
 .PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest
 
diff --git a/manual/source/alert.rst b/manual/source/alert.rst
index 69f3c5a..83c491b 100644
--- a/manual/source/alert.rst
+++ b/manual/source/alert.rst
@@ -1,5 +1,7 @@
 .. _alerts:
 
+.. index:: alerts
+
 =====
 Alert
 =====
diff --git a/manual/source/custom_slides.rst b/manual/source/custom_slides.rst
index 442996d..8aa410c 100644
--- a/manual/source/custom_slides.rst
+++ b/manual/source/custom_slides.rst
@@ -1,5 +1,6 @@
 .. _custom-slides:
 
+
 Custom Slides
 =============
 
@@ -30,3 +31,4 @@ displayed in the screen title. The option to show titles can be configured using
 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.
+