[Python-checkins] cpython (merge 3.1 -> 3.1): Branch merge

[eric.araujo]

http://hg.python.org/cpython/rev/ecf41fca3273
changeset:   69762:ecf41fca3273
branch:      3.1
parent:      69761:4dabb605c50c
parent:      69760:961c4b893e63
user:        Éric Araujo <merwok at netwok.org>
date:        Mon May 02 13:10:36 2011 +0200
summary:
  Branch merge

files:
  Doc/documenting/markup.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/documenting/markup.rst b/Doc/documenting/markup.rst
--- a/Doc/documenting/markup.rst
+++ b/Doc/documenting/markup.rst
@@ -208,8 +208,8 @@
 
    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
 

-- 
Repository URL: http://hg.python.org/cpython