diff options
author | Éric Araujo <merwok@netwok.org> | 2011-05-02 11:33:14 (GMT) |
---|---|---|
committer | Éric Araujo <merwok@netwok.org> | 2011-05-02 11:33:14 (GMT) |
commit | f95f18048d897f4db27252ed9593df0999f58eec (patch) | |
tree | 16d830c5fd1a7ee1f9bd6cff55b5e083e2e6920c /Doc/documenting | |
parent | 0255973af68e03697921ec862abd811fc08dfd6d (diff) | |
parent | 38cfe89665604b5ea786b6708c175d5916c7afb1 (diff) | |
download | cpython-f95f18048d897f4db27252ed9593df0999f58eec.zip cpython-f95f18048d897f4db27252ed9593df0999f58eec.tar.gz cpython-f95f18048d897f4db27252ed9593df0999f58eec.tar.bz2 |
Merge 3.2
Diffstat (limited to 'Doc/documenting')
-rw-r--r-- | Doc/documenting/markup.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/documenting/markup.rst b/Doc/documenting/markup.rst index 1f5b1e3..57d9eeb 100644 --- a/Doc/documenting/markup.rst +++ b/Doc/documenting/markup.rst @@ -239,8 +239,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:: decoratormethod |