Merge 3.1

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
 

Doc/library/stdtypes.rst

@@ -440,7 +440,7 @@ Additional Methods on Integer Types
 -----------------------------------
 
 The int type implements the :class:`numbers.Integral` :term:`abstract base
-class`. In addition, it provides one more method
+class`. In addition, it provides one more method:
 
 .. method:: int.bit_length()