Commits

Georg Brandl committed 1f40a2b Merge

merge with 1.0

Comments (0)

Files changed (2)

doc/markup/index.rst

 Sphinx Markup Constructs
 ========================
 
-Sphinx adds a lot of new directives and interpreted text roles to standard reST
-markup.  This section contains the reference material for these facilities.
+Sphinx adds a lot of new directives and interpreted text roles to `standard reST
+markup`_.  This section contains the reference material for these facilities.
 
 .. toctree::
 
    misc
 
 More markup is added by :ref:`domains`.
+
+.. _standard reST markup: http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html

sphinx/domains/cpp.py

 from sphinx.directives import ObjectDescription
 from sphinx.util.nodes import make_refnode
 from sphinx.util.compat import Directive
-from sphinx.util.docfields import TypedField
 
 
 _identifier_re = re.compile(r'\b(~?[a-zA-Z_][a-zA-Z0-9_]*)\b')