Commits

Georg Brandl committed 4a69b56 Merge

merge with 0.6

Comments (0)

Files changed (2)

doc/ext/autodoc.rst

 
      .. versionadded:: 0.3
 
-   * It's possible to override the signature for callable members (functions,
-     methods, classes) with the regular syntax that will override the signature
-     gained from instropection::
+   * It's possible to override the signature for explicitly documented callable
+     objects (functions, methods, classes) with the regular syntax that will
+     override the signature gained from introspection::
 
         .. autoclass:: Noodle(type)
 

sphinx/environment.py

             pub.publish()
             doctree = pub.document
         except UnicodeError, err:
-            import pdb; pdb.set_trace()
             raise SphinxError(str(err))
         self.filter_messages(doctree)
         self.process_dependencies(docname, doctree)