diff options
| author | Éric Araujo <merwok@netwok.org> | 2011-05-02 11:12:23 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2011-05-02 11:12:23 (GMT) |
| commit | 38cfe89665604b5ea786b6708c175d5916c7afb1 (patch) | |
| tree | b014330390787aa0a40fd0c3b6ddd1851b5d72a8 | |
| parent | c704378987a8347d628b6c0f4c302ecda6d757d0 (diff) | |
| parent | cd6756d2ae271477c4af4838fa93d4c7e651e939 (diff) | |
| download | cpython-38cfe89665604b5ea786b6708c175d5916c7afb1.zip cpython-38cfe89665604b5ea786b6708c175d5916c7afb1.tar.gz cpython-38cfe89665604b5ea786b6708c175d5916c7afb1.tar.bz2 | |
Merge 3.1
| -rw-r--r-- | Doc/documenting/markup.rst | 4 | ||||
| -rw-r--r-- | Doc/library/stdtypes.rst | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Doc/documenting/markup.rst b/Doc/documenting/markup.rst index 1f5b1e3..57d9eeb 100644 --- a/Doc/documenting/markup.rst +++ b/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 diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst index b01dcdc..e3c8b15 100644 --- a/Doc/library/stdtypes.rst +++ b/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() |