mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merge 3.2

Browse source
This commit is contained in:
Éric Araujo 2011-05-02 13:33:14 +02:00
commit f95f18048d
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Doc/documenting/markup.rst
View file

@ -239,8 +239,8 @@ The directives are:
Describes an object method. The parameters should not include the ``self`` Describes an object method. The parameters should not include the ``self``
parameter. The description should include similar information to that parameter. The description should include similar information to that
described for ``function``. This method should be nested in a class described for ``function``. This directive should be nested in a class
method, like in the example above. directive, like in the example above.
.. describe:: decoratormethod .. describe:: decoratormethod

2
Doc/library/stdtypes.rst
View file

@ -440,7 +440,7 @@ Additional Methods on Integer Types
----------------------------------- -----------------------------------
The int type implements the :class:`numbers.Integral` :term:`abstract base 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() .. method:: int.bit_length()