Merge 3.1

diff --cc Doc/documenting/markup.rst
index 1f5b1e36e78f51dd1bbafae43265e9fc02b10c18,a2b91238a9d1e5a6b54c6932095dc9207691c630..57d9eeba14723cc9eadccd965f054cab2566be2b
--- 1/Doc/documenting/markup.rst
--- 2/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.

diff --cc Doc/library/stdtypes.rst
Simple merge