[mapserver-commits] r9707 - branches/branch-5-6/docs

[svn at osgeo.org]

Author: hobu
Date: 2010-01-18 12:47:01 -0500 (Mon, 18 Jan 2010)
New Revision: 9707

Modified:
   branches/branch-5-6/docs/Makefile
   branches/branch-5-6/docs/conf.py
Log:
backport r9706

Modified: branches/branch-5-6/docs/Makefile
===================================================================
--- branches/branch-5-6/docs/Makefile	2010-01-18 17:45:44 UTC (rev 9706)
+++ branches/branch-5-6/docs/Makefile	2010-01-18 17:47:01 UTC (rev 9707)
@@ -47,6 +47,14 @@
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html/<language>.";\
 
+singlehtml:
+	@for lang in $(LANGUAGES);\
+	do \
+		mkdir -p $(BUILDDIR)/singlehtml/$$lang $(BUILDDIR)/doctrees/$$lang; \
+		$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $$lang $(BUILDDIR)/singlehtml/$$lang;\
+	done
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/singlehtml/<language>.";\
 
 pickle:
 	@for lang in $(LANGUAGES);\
@@ -88,6 +96,26 @@
 	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex/<language>."\
 	@echo "Run \`make all-pdf' or \`make all-ps'"
 
+pdf:
+	@for lang in $(LANGUAGES);\
+	do \
+		mkdir -p $(BUILDDIR)/pdf/$$lang $(BUILDDIR)/doctrees/$$lang; \
+		$(SPHINXBUILD) -b pdf $(ALLSPHINXOPTS) $$lang $(BUILDDIR)/pdf/$$lang;\
+	done
+	@echo
+	@echo "Build finished; the PDF files are in $(BUILDDIR)/pdf/<language>."\
+	@echo "Run \`make pdf' "
+
+epub:
+	@for lang in $(LANGUAGES);\
+	do \
+		mkdir -p $(BUILDDIR)/epub/$$lang $(BUILDDIR)/doctrees/$$lang; \
+		$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $$lang $(BUILDDIR)/epub/$$lang;\
+	done
+	@echo
+	@echo "Build finished; the epub files are in $(BUILDDIR)/epub/<language>."\
+	@echo "Run \`make epub' "
+
 all-pdf:
 	@for lang in $(LANGUAGES);\
 	do \

Modified: branches/branch-5-6/docs/conf.py
===================================================================
--- branches/branch-5-6/docs/conf.py	2010-01-18 17:45:44 UTC (rev 9706)
+++ branches/branch-5-6/docs/conf.py	2010-01-18 17:47:01 UTC (rev 9707)
@@ -23,7 +23,7 @@
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['labels']
+#extensions = ['labels']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -220,6 +220,40 @@
 # If false, no coverpage is generated.
 #pdf_use_coverpage = True 
 
+
+# -- Options for Epub output ---------------------------------------------------
+
+# Bibliographic Dublin Core info.
+epub_title = 'MapServer Documentation'
+epub_author = 'Steve Lime'
+epub_publisher = 'http://mapserver.org'
+epub_copyright = copyright
+
+# The language of the text. It defaults to the language option
+# or en if the language is not set.
+#epub_language = ''
+
+# The scheme of the identifier. Typical schemes are ISBN or URL.
+epub_scheme = 'URL'
+
+# The unique identifier of the text. This can be a ISBN number
+# or the project homepage.
+epub_identifier = 'http://mapserver.org'
+
+# A unique identification for the text.
+#epub_uid = ''
+
+# HTML files that should be inserted before the pages created by sphinx.
+# The format is a list of tuples containing the path and title.
+#epub_pre_files = []
+
+# HTML files shat should be inserted after the pages created by sphinx.
+# The format is a list of tuples containing the path and title.
+#epub_post_files = []
+
+# A list of files that should not be packed into the epub file.
+#epub_exclude_files = []
+
 from pygments.lexer import RegexLexer, bygroups,combined, include
 from pygments.token import *
 from pygments import highlight