head

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 -----------------------------------------------------
 
@@ -39,7 +41,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

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
@@ -13,3 +13,6 @@
    theme
    ui
    utils
+
+.. automodule:: openlp.core
+   :members:

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

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
 

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