[Docs] Update custom manpage builder to support Sphinx 1.3.6

Fix windows build file to use custom manpage builder.
ksmurchison · Apr 19, 2016 · f3fab4e · f3fab4e
1 parent 15286a7
commit f3fab4e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/doc/make.bat b/doc/make.bat
@@ -175,7 +175,7 @@ if "%1" == "text" (
 )
 
 if "%1" == "man" (
-	%SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
+	%SPHINXBUILD% -b cyrman %ALLSPHINXOPTS% %BUILDDIR%/man
 	if errorlevel 1 exit /b 1
 	echo.
 	echo.Build finished. The manual pages are in %BUILDDIR%/man.

diff --git a/doc/source/exts/sphinxlocal/builders/manpage.py b/doc/source/exts/sphinxlocal/builders/manpage.py
@@ -14,6 +14,7 @@
 
 from os import path
 
+from six import string_types
 from docutils.io import FileOutput
 from docutils.frontend import OptionParser
 
@@ -59,7 +60,7 @@ def write(self, *ignored):
 
         for info in self.config.man_pages:
             docname, name, description, authors, section = info
-            if isinstance(authors, basestring):
+            if isinstance(authors, string_types):
                 if authors:
                     authors = [authors]
                 else:
@@ -74,7 +75,7 @@ def write(self, *ignored):
             tree = self.env.get_doctree(docname)
             docnames = set()
             largetree = inline_all_toctrees(self, docnames, docname, tree,
-                                            darkgreen)
+                                            darkgreen, [docname])
             self.info('} ', nonl=True)
             self.env.resolve_references(largetree, docname, self)
             # remove pending_xref nodes