Updated tox doc task to build manpage and readme as well, fixed manpage vs sphinx 1.0 issues, updated some nose version strings and make mkrelease run tox and build versions for python 2 and 3

1 files changed, 8 insertions, 6 deletions

diff --git a/doc/manpage.py b/doc/manpage.py
index 656d26e..3d9ffae 100644
--- a/doc/manpage.py
+++ b/doc/manpage.py
@@ -322,14 +322,10 @@ class Translator(nodes.NodeVisitor):
         pass
 
     def visit_admonition(self, node, name):
-        raise NotImplementedError, node.astext()
-        self.body.append(self.starttag(node, 'div', CLASS=name))
-        self.body.append('<p class="admonition-title">'
-                         + self.language.labels[name] + '</p>\n')
+        self.visit_block_quote(node)
 
     def depart_admonition(self):
-        raise NotImplementedError, node.astext()
-        self.body.append('</div>\n')
+        self.depart_block_quote(None)
 
     def visit_attention(self, node):
         self.visit_admonition(node, 'attention')
@@ -996,6 +992,12 @@ class Translator(nodes.NodeVisitor):
     def depart_tgroup(self, node):
         pass
 
+    def visit_compound(self, node):
+        pass
+
+    def depart_compound(self, node):
+        pass
+
     def visit_thead(self, node):
         raise NotImplementedError, node.astext()
         self.write_colspecs()