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

diff --git a/Doc/library/bdb.rst b/Doc/library/bdb.rst
index d6d4ae2ec0d1987c812962399165c1d79eb1ed1b..3d7e41b246ebf957dea3a13c54b057fccc7620de 100644 (file)
--- a/Doc/library/bdb.rst
+++ b/Doc/library/bdb.rst
@@ -76,7 +76,7 @@ The :mod:`bdb` module also defines two classes:
    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.

diff --git a/Doc/library/operator.rst b/Doc/library/operator.rst
index 175314ee641cb2c1e082a607001e40014b3c53ef..e24c69f79dba13bd9547d84cbc7408199f1042c6 100644 (file)
--- a/Doc/library/operator.rst
+++ b/Doc/library/operator.rst
@@ -109,8 +109,6 @@ The mathematical and bitwise operations are the most numerous:
 
    Return *a* converted to an integer.  Equivalent to ``a.__index__()``.
 
-   .. versionadded:: 2.5
-
 
 .. function:: inv(obj)
               invert(obj)

diff --git a/Doc/library/string.rst b/Doc/library/string.rst
index d43d83e7ff345a4e08fcee334c0c441c021e9106..465d294958483f84f421d7b267dae834be472edc 100644 (file)
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -471,8 +471,6 @@ The available presentation types for floating point and decimal values are:
 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: