[Python-checkins] cpython (merge default -> default): Merge.

Mon May 2 14:18:29 CEST 2011

http://hg.python.org/cpython/rev/51fe7d3250a1
changeset: 69776:51fe7d3250a1
parent: 69775:347fa1c0b953
parent: 69764:92f563a14076
user: Vinay Sajip <vinay_sajip at yahoo.co.uk>
date: Mon May 02 13:18:21 2011 +0100
summary:
 Merge.
files:
 Doc/documenting/markup.rst | 4 ++--
 Doc/library/stdtypes.rst | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Doc/documenting/markup.rst b/Doc/documenting/markup.rst
--- a/Doc/documenting/markup.rst
+++ b/Doc/documenting/markup.rst
@@ -239,8 +239,8 @@
 
 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
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -440,7 +440,7 @@
 -----------------------------------
 
 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()
 
-- 
Repository URL: http://hg.python.org/cpython
