Merge 3.1

This commit is contained in:
Éric Araujo 2011-05-02 13:12:23 +02:00
commit 38cfe89665
2 changed files with 3 additions and 3 deletions

View File

@ -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

View File

@ -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()