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.
+