[Python-checkins] r77804 - in python/branches/release31-maint: Doc/library/bdb.rst Doc/library/operator.rst Doc/library/string.rst

[ezio.melotti]

Author: ezio.melotti
Date: Wed Jan 27 23:53:48 2010
New Revision: 77804

Log:
Merged revisions 77803 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r77803 | ezio.melotti | 2010-01-28 00:44:03 +0200 (Thu, 28 Jan 2010) | 1 line
  
  updated/removed a few versionadded/versionchanged
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/library/bdb.rst
   python/branches/release31-maint/Doc/library/operator.rst
   python/branches/release31-maint/Doc/library/string.rst

Modified: python/branches/release31-maint/Doc/library/bdb.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/bdb.rst	(original)
+++ python/branches/release31-maint/Doc/library/bdb.rst	Wed Jan 27 23:53:48 2010
@@ -76,7 +76,7 @@
    frame is considered to originate in a certain module is determined
    by the ``__name__`` in the frame globals.
 
-   .. versionadded:: 2.7
+   .. versionadded:: 3.1
       The *skip* argument.
 
    The following methods of :class:`Bdb` normally don't need to be overridden.

Modified: python/branches/release31-maint/Doc/library/operator.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/operator.rst	(original)
+++ python/branches/release31-maint/Doc/library/operator.rst	Wed Jan 27 23:53:48 2010
@@ -109,8 +109,6 @@
 
    Return *a* converted to an integer.  Equivalent to ``a.__index__()``.
 
-   .. versionadded:: 2.5
-
 
 .. function:: inv(obj)
               invert(obj)

Modified: python/branches/release31-maint/Doc/library/string.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/string.rst	(original)
+++ python/branches/release31-maint/Doc/library/string.rst	Wed Jan 27 23:53:48 2010
@@ -471,8 +471,6 @@
 Template strings
 ----------------
 
-.. versionadded:: 2.4
-
 Templates provide simpler string substitutions as described in :pep:`292`.
 Instead of the normal ``%``\ -based substitutions, Templates support ``$``\
 -based substitutions, using the following rules: