summaryrefslogtreecommitdiffstats
path: root/Doc/documenting
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-06-09 11:13:24 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-06-09 11:13:24 (GMT)
commitebc991c0ce4493be276f2ea29676131b8880ec10 (patch)
tree76797bb878eeb5a709acad081a0e6d0dc047da31 /Doc/documenting
parent9c669ccc77c85eac245d460bab510a38b20d9a08 (diff)
parentd2f8cec88558993e10c1dae103a5bae6549e25ef (diff)
downloadcpython-ebc991c0ce4493be276f2ea29676131b8880ec10.zip
cpython-ebc991c0ce4493be276f2ea29676131b8880ec10.tar.gz
cpython-ebc991c0ce4493be276f2ea29676131b8880ec10.tar.bz2
Branch merge
Diffstat (limited to 'Doc/documenting')
-rw-r--r--Doc/documenting/markup.rst11
1 files changed, 6 insertions, 5 deletions
diff --git a/Doc/documenting/markup.rst b/Doc/documenting/markup.rst
index 57d9eeb..c005d0c 100644
--- a/Doc/documenting/markup.rst
+++ b/Doc/documenting/markup.rst
@@ -98,11 +98,12 @@ following example shows all of the features of this directive type::
Spam or ham the foo.
-The signatures of object methods or data attributes should always include the
-type name (``.. method:: FileInput.input(...)``), even if it is obvious from the
-context which type they belong to; this is to enable consistent
-cross-references. If you describe methods belonging to an abstract protocol,
-such as "context managers", include a (pseudo-)type name too to make the
+The signatures of object methods or data attributes should not include the
+class name, but be nested in a class directive. The generated files will
+reflect this nesting, and the target identifiers (for HTML output) will use
+both the class and method name, to enable consistent cross-references. If you
+describe methods belonging to an abstract protocol such as context managers,
+use a class directive with a (pseudo-)type name too to make the
index entries more informative.
The directives are: