summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-05-02 11:10:36 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-05-02 11:10:36 (GMT)
commitcd6756d2ae271477c4af4838fa93d4c7e651e939 (patch)
tree74389b019d0b3cf58e9be34294eb3849270a1b5e
parentb79c234e1a09cc1ea143fda75f98b1704d5915b1 (diff)
parent3bba57d5967b776b9d547fa124eedffd38973238 (diff)
downloadcpython-cd6756d2ae271477c4af4838fa93d4c7e651e939.zip
cpython-cd6756d2ae271477c4af4838fa93d4c7e651e939.tar.gz
cpython-cd6756d2ae271477c4af4838fa93d4c7e651e939.tar.bz2
Branch merge
-rw-r--r--Doc/documenting/markup.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/documenting/markup.rst b/Doc/documenting/markup.rst
index be7718d..a2b9123 100644
--- a/Doc/documenting/markup.rst
+++ b/Doc/documenting/markup.rst
@@ -208,8 +208,8 @@ The directives are:
Describes an object method. The parameters should not include the ``self``
parameter. The description should include similar information to that
- described for ``function``. This method should be nested in a class
- method, like in the example above.
+ described for ``function``. This directive should be nested in a class
+ directive, like in the example above.
.. describe:: opcode