From: Éric Araujo <merwok@netwok.org>
Date: Mon, 2 May 2011 11:12:23 +0000 (+0200)
Subject: Merge 3.1
X-Git-Tag: v3.2.1b1~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=38cfe89665604b5ea786b6708c175d5916c7afb1;p=thirdparty%2FPython%2Fcpython.git

Merge 3.1
---

38cfe89665604b5ea786b6708c175d5916c7afb1
diff --cc Doc/documenting/markup.rst
index 1f5b1e36e78f,a2b91238a9d1..57d9eeba1472
--- a/Doc/documenting/markup.rst
+++ b/Doc/documenting/markup.rst
@@@ -239,15 -208,9 +239,15 @@@ 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
 +
 +   Same as ``decorator``, but for decorators that are methods.
 +
 +   Refer to a decorator method using the ``:meth:`` role.
 +
  .. describe:: opcode
  
     Describes a Python :term:`bytecode` instruction.