Merge lp:~springermac/openlp/documentation-applehelp into lp:~openlp-documentation/openlp/trunk

[Jonathan Springer]

Add support for generating applehelp

[Tim Bentley (trb143)]

Clueless it's OSX

review: Approve

[Raoul Snyman (raoul-snyman)]

review: Approve

=== modified file 'manual/Makefile'
--- manual/Makefile	2012-06-15 06:01:35 +0000
+++ manual/Makefile	2015-08-24 18:22:06 +0000
@@ -21,6 +21,7 @@
 	@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 "  applehelp to make HTML files and a applehelp 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"
@@ -64,6 +65,11 @@
 	@echo "To view the help file:"
 	@echo "# assistant -collectionFile build/qthelp/OpenLP.qhc"
 
+applehelp:
+	$(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) build/applehelp
+	@echo
+	@echo "Build finished. The help file is in build/applehelp."
+
 latex:
 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) build/latex
 	@echo
 
=== modified file 'manual/source/conf.py'
--- manual/source/conf.py	2012-10-13 16:53:21 +0000
+++ manual/source/conf.py	2015-08-24 18:22:06 +0000
@@ -95,7 +95,7 @@
 if sys.argv[2] == 'qthelp' or sys.argv[2] == 'htmlhelp':
     html_theme = 'openlp_qthelp'
 else:
-    html_theme = 'default'
+    html_theme = 'classic'
 
 # 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
@@ -226,3 +226,7 @@
     ('index', 'openlp', u'OpenLP Reference Manual',
      [u'Wesley Stout'], 1)
 ]
+
+# -- Options for apple help output --------------------------------------------
+
+applehelp_bundle_id = 'org.openlp.OpenLP.help'