COMP: Remove warning about code being unused

author: Andy Cedilnik <andy.cedilnik@kitware.com> 2005-03-04 14:46:31 (GMT)
committer: Andy Cedilnik <andy.cedilnik@kitware.com> 2005-03-04 14:46:31 (GMT)
commit: 7bc8413a0f4761e7c5a5fb1cccc8350f3d47f47d (patch)
tree: 240361002c876c4345418844e3a18553ed102402 /Utilities
parent: a98ce34c814947bfbc5a6322f3baa19756b2e702 (diff)
download: CMake-7bc8413a0f4761e7c5a5fb1cccc8350f3d47f47d.zip
CMake-7bc8413a0f4761e7c5a5fb1cccc8350f3d47f47d.tar.gz
CMake-7bc8413a0f4761e7c5a5fb1cccc8350f3d47f47d.tar.bz2
1 files changed, 1 insertions, 1 deletions
diff --git a/Utilities/cmxmlrpc/xmlrpc_registry.c b/Utilities/cmxmlrpc/xmlrpc_registry.c
index 43f6463..a0498b1 100644
--- a/Utilities/cmxmlrpc/xmlrpc_registry.c
+++ b/Utilities/cmxmlrpc/xmlrpc_registry.c
@@ -682,7 +682,7 @@ system_methodSignature(xmlrpc_env *env,
     xmlrpc_value *ignored1, *ignored2, *ignored3;
     xmlrpc_value *item, *current, *result;
     int at_sig_start;
-    char *sig, *code;
+    char *sig, *code = 0;
 
     XMLRPC_ASSERT_ENV_OK(env);
     XMLRPC_ASSERT_VALUE_OK(param_array);
diff --git a/Doc/distutils/setupscript.rst b/Doc/distutils/setupscript.rst
index 26f50e6..3ffcc78 100644
--- a/Doc/distutils/setupscript.rst
+++ b/Doc/distutils/setupscript.rst
@@ -488,8 +488,6 @@ The corresponding call to :func:`setup` might be::
          package_data={'mypkg': ['data/*.dat']},
          )
 
-.. versionadded:: 2.4
-
 
 Installing Additional Files
 ===========================
diff --git a/Doc/distutils/uploading.rst b/Doc/distutils/uploading.rst
index 0b82184..5be4130 100644
--- a/Doc/distutils/uploading.rst
+++ b/Doc/distutils/uploading.rst
@@ -4,8 +4,6 @@
 Uploading Packages to the Package Index
 ***************************************
 
-.. versionadded:: 2.5
-
 The Python Package Index (PyPI) not only stores the package info, but also  the
 package data if the author of the package wishes to. The distutils command
 :command:`upload` pushes the distribution files to PyPI.
diff --git a/Doc/extending/newtypes.rst b/Doc/extending/newtypes.rst
index 1d9ab1c..c8e49fe 100644
--- a/Doc/extending/newtypes.rst
+++ b/Doc/extending/newtypes.rst
@@ -1125,8 +1125,6 @@ not been updated to use some of the new generic mechanism that is available.
 Generic Attribute Management
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. versionadded:: 2.2
-
 Most extension types only use *simple* attributes.  So, what makes the
 attributes simple?  There are only a couple of conditions that must be met:
 
diff --git a/Doc/install/index.rst b/Doc/install/index.rst
index 980956a..8c9bd7c 100644
--- a/Doc/install/index.rst
+++ b/Doc/install/index.rst
@@ -343,9 +343,6 @@ installed to the following directories under the installation base as follows:
 | data                         | :file:`{home}/share`      | :option:`--install-data`    |
 +------------------------------+---------------------------+-----------------------------+
 
-.. versionchanged:: 2.4
-   The :option:`--home` option used to be supported only on Unix.
-
 
 .. _inst-alt-install-home:
 
diff --git a/Doc/library/_ast.rst b/Doc/library/_ast.rst
index 9b195be..d3cdfb9 100644
--- a/Doc/library/_ast.rst
+++ b/Doc/library/_ast.rst
@@ -9,8 +9,6 @@ Abstract Syntax Trees
 .. sectionauthor:: Martin v. Löwis <martin@v.loewis.de>
 
 
-.. versionadded:: 2.5
-
 The ``_ast`` module helps Python applications to process trees of the Python
 abstract syntax grammar. The Python compiler currently provides read-only access
 to such trees, meaning that applications can only create a tree for a given
diff --git a/Doc/library/_winreg.rst b/Doc/library/_winreg.rst
index fddbfd1..fc185a2 100644
--- a/Doc/library/_winreg.rst
+++ b/Doc/library/_winreg.rst
@@ -8,8 +8,6 @@
 .. sectionauthor:: Mark Hammond <MarkH@ActiveState.com>
 
 
-.. versionadded:: 2.0
-
 These functions expose the Windows registry API to Python.  Instead of using an
 integer as the registry handle, a handle object is used to ensure that the
 handles are closed correctly, even if the programmer neglects to explicitly
diff --git a/Doc/library/array.rst b/Doc/library/array.rst
index 5194edc..c2b7a44 100644
--- a/Doc/library/array.rst
+++ b/Doc/library/array.rst
@@ -59,9 +59,6 @@ The module defines the following type:
    from the optional *initializer* value, which must be a list, string, or iterable
    over elements of the appropriate type.
 
-   .. versionchanged:: 2.4
-      Formerly, only lists or strings were accepted.
-
    If given a list or string, the initializer is passed to the new array's
    :meth:`fromlist`, :meth:`fromstring`, or :meth:`fromunicode` method (see below)
    to add initial items to the array.  Otherwise, the iterable initializer is
@@ -135,9 +132,6 @@ The following data items and methods are also supported:
    be raised.  If *iterable* is not an array, it must be iterable and its elements
    must be the right type to be appended to the array.
 
-   .. versionchanged:: 2.4
-      Formerly, the argument could only be another array.
-
 
 .. method:: array.fromfile(f, n)
 
diff --git a/Doc/library/atexit.rst b/Doc/library/atexit.rst
index 94d750b..cb2199a 100644
--- a/Doc/library/atexit.rst
+++ b/Doc/library/atexit.rst
@@ -8,8 +8,6 @@
 .. sectionauthor:: Skip Montanaro <skip@mojam.com>
 
 
-.. versionadded:: 2.0
-
 The :mod:`atexit` module defines functions to register and unregister cleanup
 functions.  Functions thus registered are automatically executed upon normal
 interpreter termination.
@@ -36,9 +34,8 @@ is killed by a signal, when a Python fatal internal error is detected, or when
    saved.  After all exit handlers have had a chance to run the last exception to
    be raised is re-raised.
 
-   .. versionchanged:: 2.6
-      This function now returns *func* which makes it possible to use it as a
-      decorator without binding the original name to ``None``.
+   This function returns *func* which makes it possible to use it as a decorator
+   without binding the original name to ``None``.
 
 
 .. function:: unregister(func)
@@ -47,8 +44,6 @@ is killed by a signal, when a Python fatal internal error is detected, or when
    shutdown.  After calling :func:`unregister`, *func* is guaranteed not to be
    called when the interpreter shuts down.
 
-   .. versionadded:: 3.0
-
 
 .. seealso::
 
diff --git a/Doc/library/audioop.rst b/Doc/library/audioop.rst
index 84a2690..7779610 100644
--- a/Doc/library/audioop.rst
+++ b/Doc/library/audioop.rst
@@ -53,8 +53,6 @@ The module defines the following variables and functions:
    a-LAW encoding always uses 8 bits samples, so *width* refers only to the sample
    width of the output fragment here.
 
-   .. versionadded:: 2.5
-
 
 .. function:: avg(fragment, width)
 
@@ -133,8 +131,6 @@ The module defines the following variables and functions:
    range of about 13 bits using only 8 bit samples.  It is used by the Sun audio
    hardware, among others.
 
-   .. versionadded:: 2.5
-
 
 .. function:: lin2lin(fragment, width, newwidth)
 
diff --git a/Doc/library/basehttpserver.rst b/Doc/library/basehttpserver.rst
index 2e8d6a3..0f65b26 100644
--- a/Doc/library/basehttpserver.rst
+++ b/Doc/library/basehttpserver.rst
@@ -228,9 +228,6 @@ A :class:`BaseHTTPRequestHandler` instance has the following methods:
 
    The result looks like ``'Sun, 06 Nov 1994 08:49:37 GMT'``.
 
-   .. versionadded:: 2.5
-      The *timestamp* parameter.
-
 
 .. method:: BaseHTTPRequestHandler.log_date_time_string()
 
diff --git a/Doc/library/bisect.rst b/Doc/library/bisect.rst
index b8eb348..10f72fb 100644
--- a/Doc/library/bisect.rst
+++ b/Doc/library/bisect.rst
@@ -30,16 +30,12 @@ The following functions are provided:
    existing entries.  The return value is suitable for use as the first parameter
    to ``list.insert()``.  This assumes that *list* is already sorted.
 
-   .. versionadded:: 2.1
-
 
 .. function:: bisect_right(list, item[, lo[, hi]])
 
    Similar to :func:`bisect_left`, but returns an insertion point which comes after
    (to the right of) any existing entries of *item* in *list*.
 
-   .. versionadded:: 2.1
-
 
 .. function:: bisect(...)
 
@@ -52,16 +48,12 @@ The following functions are provided:
    ``list.insert(bisect.bisect_left(list, item, lo, hi), item)``.  This assumes
    that *list* is already sorted.
 
-   .. versionadded:: 2.1
-
 
 .. function:: insort_right(list, item[, lo[, hi]])
 
    Similar to :func:`insort_left`, but inserting *item* in *list* after any
    existing entries of *item*.
 
-   .. versionadded:: 2.1
-
 
 .. function:: insort(...)
 
diff --git a/Doc/library/bsddb.rst b/Doc/library/bsddb.rst
index 55b7c7d..c5c6276 100644
--- a/Doc/library/bsddb.rst
+++ b/Doc/library/bsddb.rst
@@ -82,8 +82,6 @@ arguments should be used in most instances.
 
    Wrapper class around a DB object that supports string keys (rather than bytes).
    All keys are encoded as UTF-8, then passed to the underlying object.
-   
-   .. versionadded:: 3.0
 
 
 .. class:: StringValues(db)
@@ -91,8 +89,6 @@ arguments should be used in most instances.
    Wrapper class around a DB object that supports string values (rather than bytes).
    All values are encoded as UTF-8, then passed to the underlying object.
 
-   .. versionadded:: 3.0
-
 
 .. seealso::
 
@@ -108,9 +104,6 @@ Hash, BTree and Record Objects
 Once instantiated, hash, btree and record objects support the same methods as
 dictionaries.  In addition, they support the methods listed below.
 
-.. versionchanged:: 2.3.1
-   Added dictionary methods.
-
 
 .. method:: bsddbobject.close()
 
diff --git a/Doc/library/bz2.rst b/Doc/library/bz2.rst
index a8c0911..73fd450 100644
--- a/Doc/library/bz2.rst
+++ b/Doc/library/bz2.rst
@@ -8,8 +8,6 @@
 .. sectionauthor:: Gustavo Niemeyer <niemeyer@conectiva.com>
 
 
-.. versionadded:: 2.3
-
 This module provides a comprehensive interface for the bz2 compression library.
 It implements a complete file interface, one-shot (de)compression functions, and
 types for sequential (de)compression.
diff --git a/Doc/library/calendar.rst b/Doc/library/calendar.rst
index aa13c81..e125ccc 100644
--- a/Doc/library/calendar.rst
+++ b/Doc/library/calendar.rst
@@ -32,11 +32,9 @@ it's the base calendar for all computations.
    preparing the calendar data for formatting. This class doesn't do any formatting
    itself. This is the job of subclasses.
 
-   .. versionadded:: 2.5
 
 :class:`Calendar` instances have the following methods:
 
-
 .. method:: Calendar.iterweekdays(weekday)
 
    Return an iterator for the week day numbers that will be used for one week. The
@@ -109,11 +107,9 @@ it's the base calendar for all computations.
 
    This class can be used to generate plain text calendars.
 
-   .. versionadded:: 2.5
 
 :class:`TextCalendar` instances have the following methods:
 
-
 .. method:: TextCalendar.formatmonth(theyear, themonth[, w[, l]])
 
    Return a month's calendar in a multi-line string. If *w* is provided, it
@@ -145,11 +141,9 @@ it's the base calendar for all computations.
 
    This class can be used to generate HTML calendars.
 
-   .. versionadded:: 2.5
 
 :class:`HTMLCalendar` instances have the following methods:
 
-
 .. method:: HTMLCalendar.formatmonth(theyear, themonth[, withyear])
 
    Return a month's calendar as an HTML table. If *withyear* is true the year will
@@ -178,8 +172,6 @@ it's the base calendar for all computations.
    this locale includes an encoding all strings containing month and weekday names
    will be returned as unicode.
 
-   .. versionadded:: 2.5
-
 
 .. class:: LocaleHTMLCalendar([firstweekday[, locale]])
 
@@ -188,11 +180,9 @@ it's the base calendar for all computations.
    this locale includes an encoding all strings containing month and weekday names
    will be returned as unicode.
 
-   .. versionadded:: 2.5
 
 For simple text calendars this module provides the following functions.
 
-
 .. function:: setfirstweekday(weekday)
 
    Sets the weekday (``0`` is Monday, ``6`` is Sunday) to start each week. The
@@ -203,15 +193,11 @@ For simple text calendars this module provides the following functions.
       import calendar
       calendar.setfirstweekday(calendar.SUNDAY)
 
-   .. versionadded:: 2.0
-
 
 .. function:: firstweekday()
 
    Returns the current setting for the weekday to start each week.
 
-   .. versionadded:: 2.0
-
 
 .. function:: isleap(year)
 
@@ -223,9 +209,7 @@ For simple text calendars this module provides the following functions.
    Returns the number of leap years in the range from *y1* to *y2* (exclusive),
    where *y1* and *y2* are years.
 
-   .. versionchanged:: 2.0
-      This function didn't work for ranges spanning a century change in Python
-      1.5.2.
+   This function works for ranges spanning a century change.
 
 
 .. function:: weekday(year, month, day)
@@ -263,8 +247,6 @@ For simple text calendars this module provides the following functions.
    Returns a month's calendar in a multi-line string using the :meth:`formatmonth`
    of the :class:`TextCalendar` class.
 
-   .. versionadded:: 2.0
-
 
 .. function:: prcal(year[, w[, l[c]]])
 
@@ -276,8 +258,6 @@ For simple text calendars this module provides the following functions.
    Returns a 3-column calendar for an entire year as a multi-line string using the
    :meth:`formatyear` of the :class:`TextCalendar` class.
 
-   .. versionadded:: 2.0
-
 
 .. function:: timegm(tuple)
 
@@ -286,11 +266,9 @@ For simple text calendars this module provides the following functions.
    Unix timestamp value, assuming an epoch of 1970, and the POSIX encoding.  In
    fact, :func:`time.gmtime` and :func:`timegm` are each others' inverse.
 
-   .. versionadded:: 2.0
 
 The :mod:`calendar` module exports the following data attributes:
 
-
 .. data:: day_name
 
    An array that represents the days of the week in the current locale.
diff --git a/Doc/library/cgi.rst b/Doc/library/cgi.rst
index 29ed545..98166e8 100644
--- a/Doc/library/cgi.rst
+++ b/Doc/library/cgi.rst
@@ -164,8 +164,6 @@ actually be instances of the class :class:`MiniFieldStorage`.  In this case, the
 Higher Level Interface
 ----------------------
 
-.. versionadded:: 2.2
-
 The previous section explains how to read CGI form data using the
 :class:`FieldStorage` class.  This section describes a higher level interface
 which was added to this class to allow one to do it in a more readable and
diff --git a/Doc/library/cgitb.rst b/Doc/library/cgitb.rst
index 327cd17..c106d9e 100644
--- a/Doc/library/cgitb.rst
+++ b/Doc/library/cgitb.rst
@@ -8,8 +8,6 @@
 .. sectionauthor:: Fred L. Drake, Jr. <fdrake@acm.org>
 
 
-.. versionadded:: 2.2
-
 .. index::
    single: CGI; exceptions
    single: CGI; tracebacks
diff --git a/Doc/library/cmath.rst b/Doc/library/cmath.rst
index 2bc162c..5a9ae05 100644
--- a/Doc/library/cmath.rst
+++ b/Doc/library/cmath.rst
@@ -84,9 +84,6 @@ The functions are:
    specified, returns the natural logarithm of *x*. There is one branch cut, from 0
    along the negative real axis to -∞, continuous from above.
 
-   .. versionchanged:: 2.4
-      *base* argument added.
-
 
 .. function:: log10(x)
 
diff --git a/Doc/library/cmd.rst b/Doc/library/cmd.rst
index 9af08e2..716db67 100644
--- a/Doc/library/cmd.rst
+++ b/Doc/library/cmd.rst
@@ -28,9 +28,6 @@ interface.
    objects that the Cmd instance or subclass  instance will use for input and
    output. If not specified, they will default to *sys.stdin* and *sys.stdout*.
 
-   .. versionchanged:: 2.3
-      The *stdin* and *stdout* parameters were added.
-
 
 .. _cmd-objects:
 
diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst
index aa6bc98..f35ef76 100644
--- a/Doc/library/codecs.rst
+++ b/Doc/library/codecs.rst
@@ -118,8 +118,6 @@ functions which use :func:`lookup` for the codec lookup:
    Raises a :exc:`LookupError` in case the encoding cannot be found or the codec
    doesn't support an incremental encoder.
 
-   .. versionadded:: 2.5
-
 
 .. function:: getincrementaldecoder(encoding)
 
@@ -129,8 +127,6 @@ functions which use :func:`lookup` for the codec lookup:
    Raises a :exc:`LookupError` in case the encoding cannot be found or the codec
    doesn't support an incremental decoder.
 
-   .. versionadded:: 2.5
-
 
 .. function:: getreader(encoding)
 
@@ -245,8 +241,6 @@ utility functions:
    *iterable*. This function is a generator. *errors* (as well as any other keyword
    argument) is passed through to the incremental encoder.
 
-   .. versionadded:: 2.5
-
 
 .. function:: iterdecode(iterable, encoding[, errors])
 
@@ -254,8 +248,6 @@ utility functions:
    *iterable*. This function is a generator. *errors* (as well as any other keyword
    argument) is passed through to the incremental decoder.
 
-   .. versionadded:: 2.5
-
 The module also provides the following constants which are useful for reading
 and writing to platform dependent files:
 
@@ -390,8 +382,6 @@ encoded/decoded with the stateless encoder/decoder.
 IncrementalEncoder Objects
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. versionadded:: 2.5
-
 The :class:`IncrementalEncoder` class is used for encoding an input in multiple
 steps. It defines the following methods which every incremental encoder must
 define in order to be compatible with the Python codec registry.
@@ -447,16 +437,12 @@ define in order to be compatible with the Python codec registry.
    marshaling/pickling the state and encoding the bytes of the resulting string
    into an integer).
 
-   .. versionadded:: 3.0
-
 
 .. method:: IncrementalEncoder.setstate(state)
 
    Set the state of the encoder to *state*. *state* must be an encoder state
    returned by :meth:`getstate`.
 
-   .. versionadded:: 3.0
-
 
 .. _incremental-decoder-objects:
 
@@ -524,16 +510,12 @@ define in order to be compatible with the Python codec registry.
    marshaling/pickling the info and encoding the bytes of the resulting string into
    an integer.)
 
-   .. versionadded:: 3.0
-
 
 .. method:: IncrementalDecoder.setstate(state)
 
    Set the state of the encoder to *state*. *state* must be a decoder state
    returned by :meth:`getstate`.
 
-   .. versionadded:: 3.0
-
 The :class:`StreamWriter` and :class:`StreamReader` classes provide generic
 working interfaces which can be used to implement new encoding submodules very
 easily. See :mod:`encodings.utf_8` for an example of how this is done.
@@ -661,12 +643,6 @@ compatible with the Python codec registry.
    e.g.  if optional encoding endings or state markers are available on the stream,
    these should be read too.
 
-   .. versionchanged:: 2.4
-      *chars* argument added.
-
-   .. versionchanged:: 2.4.2
-      *firstline* argument added.
-
 
 .. method:: StreamReader.readline([size[, keepends]])
 
@@ -677,9 +653,6 @@ compatible with the Python codec registry.
 
    If *keepends* is false line-endings will be stripped from the lines returned.
 
-   .. versionchanged:: 2.4
-      *keepends* argument added.
-
 
 .. method:: StreamReader.readlines([sizehint[, keepends]])
 
@@ -1157,9 +1130,6 @@ the table.
 |                    |         |                | operand                   |
 +--------------------+---------+----------------+---------------------------+
 
-.. versionadded:: 2.3
-   The ``idna`` and ``punycode`` encodings.
-
 
 :mod:`encodings.idna` --- Internationalized Domain Names in Applications
 ------------------------------------------------------------------------
@@ -1168,8 +1138,6 @@ the table.
    :synopsis: Internationalized Domain Names implementation
 .. moduleauthor:: Martin v. Löwis
 
-.. versionadded:: 2.3
-
 This module implements :rfc:`3490` (Internationalized Domain Names in
 Applications) and :rfc:`3492` (Nameprep: A Stringprep Profile for
 Internationalized Domain Names (IDN)). It builds upon the ``punycode`` encoding
@@ -1229,8 +1197,6 @@ functions can be used directly if desired.
    :synopsis: UTF-8 codec with BOM signature
 .. moduleauthor:: Walter Dörwald
 
-.. versionadded:: 2.5
-
 This module implements a variant of the UTF-8 codec: On encoding a UTF-8 encoded
 BOM will be prepended to the UTF-8 encoded bytes. For the stateful encoder this
 is only done once (on the first write to the byte stream).  For decoding an
diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst
index 613973c..7a850b6 100644
--- a/Doc/library/collections.rst
+++ b/Doc/library/collections.rst
@@ -8,8 +8,6 @@
 .. sectionauthor:: Raymond Hettinger <python@rcn.com>
 
 
-.. versionadded:: 2.4
-
 This module implements high-performance container datatypes.  Currently,
 there are two datatypes, :class:`deque` and :class:`defaultdict`, and
 one datatype factory function, :func:`NamedTuple`. Python already
@@ -21,12 +19,6 @@ or file based ordered dictionaries with string keys.
 Future editions of the standard library may include balanced trees and
 ordered dictionaries.
 
-.. versionchanged:: 2.5
-   Added :class:`defaultdict`.
-
-.. versionchanged:: 2.6
-   Added :class:`NamedTuple`.
-
 
 .. _deque-objects:
 
@@ -49,11 +41,9 @@ ordered dictionaries.
    ``pop(0)`` and ``insert(0, v)`` operations which change both the size and
    position of the underlying data representation.
 
-   .. versionadded:: 2.4
 
 Deque objects support the following methods:
 
-
 .. method:: deque.append(x)
 
    Add *x* to the right side of the deque.
@@ -99,8 +89,6 @@ Deque objects support the following methods:
    Removed the first occurrence of *value*.  If not found, raises a
    :exc:`ValueError`.
 
-   .. versionadded:: 2.5
-
 
 .. method:: deque.rotate(n)
 
@@ -256,12 +244,10 @@ two adjacent nodes into one by grouping them in a list::
    as if they were passed to the :class:`dict` constructor, including keyword
    arguments.
 
-   .. versionadded:: 2.5
 
 :class:`defaultdict` objects support the following method in addition to the
 standard :class:`dict` operations:
 
-
 .. method:: defaultdict.__missing__(key)
 
    If the :attr:`default_factory` attribute is ``None``, this raises an
@@ -372,8 +358,6 @@ Setting the :attr:`default_factory` to :class:`set` makes the
    helpful docstring (with typename and fieldnames) and a helpful :meth:`__repr__`
    method which lists the tuple contents in a ``name=value`` format.
 
-   .. versionadded:: 2.6
-
    The *fieldnames* are specified in a single string and are separated by spaces.
    Any valid Python identifier may be used for a field name.
 
diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst
index dd91d59..b4c89e8 100644
--- a/Doc/library/configparser.rst
+++ b/Doc/library/configparser.rst
@@ -63,11 +63,6 @@ write-back, as will be the keys within each section.
    options within a section, and for the default values. This class does not
    support the magical interpolation behavior.
 
-   .. versionadded:: 2.3
-
-   .. versionchanged:: 2.6
-      *dict_type* was added.
-
 
 .. class:: ConfigParser([defaults])
 
@@ -94,8 +89,6 @@ write-back, as will be the keys within each section.
 
    .. % XXX Need to explain what's safer/more predictable about it.
 
-   .. versionadded:: 2.3
-
 
 .. exception:: NoSectionError
 
@@ -131,16 +124,12 @@ write-back, as will be the keys within each section.
    Exception raised when an option referenced from a value does not exist. Subclass
    of :exc:`InterpolationError`.
 
-   .. versionadded:: 2.3
-
 
 .. exception:: InterpolationSyntaxError
 
    Exception raised when the source text into which substitutions are made does not
    conform to the required syntax. Subclass of :exc:`InterpolationError`.
 
-   .. versionadded:: 2.3
-
 
 .. exception:: MissingSectionHeaderError
 
@@ -206,8 +195,6 @@ RawConfigParser Objects
    If the given section exists, and contains the given option, return
    :const:`True`; otherwise return :const:`False`.
 
-   .. versionadded:: 1.6
-
 
 .. method:: RawConfigParser.read(filenames)
 
@@ -229,9 +216,6 @@ RawConfigParser Objects
       config.readfp(open('defaults.cfg'))
       config.read(['site.cfg', os.path.expanduser('~/.myapp.cfg')])
 
-   .. versionchanged:: 2.4
-      Returns list of successfully parsed filenames.
-
 
 .. method:: RawConfigParser.readfp(fp[, filename])
 
@@ -281,16 +265,12 @@ RawConfigParser Objects
    true) for *internal* storage of non-string values, full functionality (including
    interpolation and output to files) can only be achieved using string values.
 
-   .. versionadded:: 1.6
-
 
 .. method:: RawConfigParser.write(fileobject)
 
    Write a representation of the configuration to the specified file object.  This
    representation can be parsed by a future :meth:`read` call.
 
-   .. versionadded:: 1.6
-
 
 .. method:: RawConfigParser.remove_option(section, option)
 
@@ -298,8 +278,6 @@ RawConfigParser Objects
    not exist, raise :exc:`NoSectionError`.  If the option existed to be removed,
    return :const:`True`; otherwise return :const:`False`.
 
-   .. versionadded:: 1.6
-
 
 .. method:: RawConfigParser.remove_section(section)
 
@@ -339,8 +317,6 @@ The :class:`ConfigParser` class extends some methods of the
    Return a list of ``(name, value)`` pairs for each option in the given *section*.
    Optional arguments have the same meaning as for the :meth:`get` method.
 
-   .. versionadded:: 2.3
-
 
 .. _safeconfigparser-objects:
 
@@ -357,5 +333,3 @@ The :class:`SafeConfigParser` class implements the same extended interface as
    otherwise raise :exc:`NoSectionError`.  *value* must be a string (:class:`str`
    or :class:`unicode`); if not, :exc:`TypeError` is raised.
 
-   .. versionadded:: 2.4
-
diff --git a/Doc/library/constants.rst b/Doc/library/constants.rst
index fecd836..8f7be50 100644
--- a/Doc/library/constants.rst
+++ b/Doc/library/constants.rst
@@ -5,19 +5,17 @@ Built-in Constants
 A small number of constants live in the built-in namespace.  They are:
 
 
+.. XXX False, True, None are keywords too
+
 .. data:: False
 
    The false value of the :class:`bool` type.
 
-   .. versionadded:: 2.3
-
 
 .. data:: True
 
    The true value of the :class:`bool` type.
 
-   .. versionadded:: 2.3
-
 
 .. data:: None
 
diff --git a/Doc/library/contextlib.rst b/Doc/library/contextlib.rst
index fffb99c..070dd88 100644
--- a/Doc/library/contextlib.rst
+++ b/Doc/library/contextlib.rst
@@ -6,8 +6,6 @@
    :synopsis: Utilities for with-statement contexts.
 
 
-.. versionadded:: 2.5
-
 This module provides utilities for common tasks involving the :keyword:`with`
 statement. For more information see also :ref:`typecontextmanager` and
 :ref:`context-managers`.
diff --git a/Doc/library/cookie.rst b/Doc/library/cookie.rst
index 5a5808f..bd7cc1e 100644
--- a/Doc/library/cookie.rst
+++ b/Doc/library/cookie.rst
@@ -110,10 +110,6 @@ Cookie Objects
    to join the headers together, and is by default the combination ``'\r\n'``
    (CRLF).
 
-   .. versionchanged:: 2.5
-      The default separator has been changed from ``'\n'`` to match the cookie
-      specification.
-
 
 .. method:: BaseCookie.js_output([attrs])
 
diff --git a/Doc/library/cookielib.rst b/Doc/library/cookielib.rst
index 44045d3..18f471e 100644
--- a/Doc/library/cookielib.rst
+++ b/Doc/library/cookielib.rst
@@ -8,10 +8,6 @@
 .. sectionauthor:: John J. Lee <jjl@pobox.com>
 
 
-.. versionadded:: 2.4
-
-
-
 The :mod:`cookielib` module defines classes for automatic handling of HTTP
 cookies.  It is useful for accessing web sites that require small pieces of data
 -- :dfn:`cookies` -- to be set on the client machine by an HTTP response from a
@@ -517,19 +513,17 @@ all be assigned to.
    case RFC 2109 cookies are downgraded if and only if RFC 2965 handling is turned
    off.  Therefore, RFC 2109 cookies are downgraded by default.
 
-   .. versionadded:: 2.5
 
 General strictness switches:
 
-
 .. attribute:: DefaultCookiePolicy.strict_domain
 
    Don't allow sites to set two-component domains with country-code top-level
    domains like ``.co.uk``, ``.gov.uk``, ``.co.nz``.etc.  This is far from perfect
    and isn't guaranteed to work!
 
-RFC 2965 protocol strictness switches:
 
+RFC 2965 protocol strictness switches:
 
 .. attribute:: DefaultCookiePolicy.strict_rfc2965_unverifiable
 
@@ -538,8 +532,8 @@ RFC 2965 protocol strictness switches:
    another site).  If this is false, cookies are *never* blocked on the basis of
    verifiability
 
-Netscape protocol strictness switches:
 
+Netscape protocol strictness switches:
 
 .. attribute:: DefaultCookiePolicy.strict_ns_unverifiable
 
@@ -683,8 +677,6 @@ internal consistency, so you should know what you're doing if you do that.
    :mod:`cookielib` may 'downgrade' RFC 2109 cookies to Netscape cookies, in
    which case :attr:`version` is 0.
 
-   .. versionadded:: 2.5
-
 
 .. attribute:: Cookie.port_specified
 
diff --git a/Doc/library/copy.rst b/Doc/library/copy.rst
index 6fb3100..ea59613 100644
--- a/Doc/library/copy.rst
+++ b/Doc/library/copy.rst
@@ -54,9 +54,6 @@ file, socket, window, array, or any similar types.  It does "copy" functions and
 classes (shallow and deeply), by returning the original object unchanged; this
 is compatible with the way these are treated by the :mod:`pickle` module.
 
-.. versionchanged:: 2.5
-   Added copying functions.
-
 .. index:: module: pickle
 
 Classes can use the same interfaces to control copying that they use to control
diff --git a/Doc/library/csv.rst b/Doc/library/csv.rst
index 19123c6..46302ef 100644
--- a/Doc/library/csv.rst
+++ b/Doc/library/csv.rst
@@ -7,8 +7,6 @@
 .. sectionauthor:: Skip Montanaro <skip@pobox.com>
 
 
-.. versionadded:: 2.3
-
 .. index::
    single: csv
    pair: data; tabular
@@ -77,14 +75,13 @@ The :mod:`csv` module defines the following functions:
    All data read are returned as strings.  No automatic data type conversion is
    performed.
 
-   .. versionchanged:: 2.5
-      The parser is now stricter with respect to multi-line quoted fields. Previously,
-      if a line ended within a quoted field without a terminating newline character, a
-      newline would be inserted into the returned field. This behavior caused problems
-      when reading files which contained carriage return characters within fields.
-      The behavior was changed to return the field without inserting newlines. As a
-      consequence, if newlines embedded within fields are important, the input should
-      be split into lines in a manner which preserves the newline characters.
+   The parser is quite strict with respect to multi-line quoted fields. Previously,
+   if a line ended within a quoted field without a terminating newline character, a
+   newline would be inserted into the returned field. This behavior caused problems
+   when reading files which contained carriage return characters within fields.
+   The behavior was changed to return the field without inserting newlines. As a
+   consequence, if newlines embedded within fields are important, the input should
+   be split into lines in a manner which preserves the newline characters.
 
 
 .. function:: writer(csvfile[, dialect='excel'][, fmtparam])
@@ -138,11 +135,9 @@ The :mod:`csv` module defines the following functions:
    Returns the current maximum field size allowed by the parser. If *new_limit* is
    given, this becomes the new limit.
 
-   .. versionadded:: 2.5
 
 The :mod:`csv` module defines the following classes:
 
-
 .. class:: DictReader(csvfile[, fieldnames=:const:None,[, restkey=:const:None[, restval=None[, dialect='excel'[, *args, **kwds]]]]])
 
    Create an object which operates like a regular reader but maps the information
@@ -352,7 +347,6 @@ Reader objects have the following public attributes:
    The number of lines read from the source iterator. This is not the same as the
    number of records returned, as records can span multiple lines.
 
-   .. versionadded:: 2.5
 
 
 Writer Objects
diff --git a/Doc/library/ctypes.rst b/Doc/library/ctypes.rst
index 1a52a75..ac259e8 100644
--- a/Doc/library/ctypes.rst
+++ b/Doc/library/ctypes.rst
@@ -7,8 +7,6 @@
 .. moduleauthor:: Thomas Heller <theller@python.net>
 
 
-.. versionadded:: 2.5
-
 ``ctypes`` is a foreign function library for Python.  It provides C compatible
 data types, and allows calling functions in dlls/shared libraries.  It can be
 used to wrap these libraries in pure Python.
@@ -2209,8 +2207,6 @@ These are the fundamental ctypes data types:
    can be True or False, and the constructor accepts any object that has a truth
    value.
 
-   .. versionadded:: 2.6
-
 
 .. class:: HRESULT
 
diff --git a/Doc/library/curses.ascii.rst b/Doc/library/curses.ascii.rst
index 0a45c2a..cf51f78 100644
--- a/Doc/library/curses.ascii.rst
+++ b/Doc/library/curses.ascii.rst
@@ -8,8 +8,6 @@
 .. sectionauthor:: Eric S. Raymond <esr@thyrsus.com>
 
 
-.. versionadded:: 1.6
-
 The :mod:`curses.ascii` module supplies name constants for ASCII characters and
 functions to test membership in various ASCII character classes.  The constants
 supplied are names for control characters as follows:
diff --git a/Doc/library/curses.rst b/Doc/library/curses.rst
index 06bac2f..046b796 100644
--- a/Doc/library/curses.rst
+++ b/Doc/library/curses.rst
@@ -8,9 +8,6 @@
 .. sectionauthor:: Eric Raymond <esr@thyrsus.com>
 
 
-.. versionchanged:: 1.6
-   Added support for the ``ncurses`` library and converted to a package.
-
 The :mod:`curses` module provides an interface to the curses library, the
 de-facto standard for portable advanced terminal handling.
 
@@ -1520,8 +1517,6 @@ The following table lists the predefined colors:
 .. sectionauthor:: Eric Raymond <esr@thyrsus.com>
 
 
-.. versionadded:: 1.6
-
 The :mod:`curses.textpad` module provides a :class:`Textbox` class that handles
 elementary text editing in a curses window, supporting a set of keybindings
 resembling those of Emacs (thus, also of Netscape Navigator, BBedit 6.x,
@@ -1656,8 +1651,6 @@ You can instantiate a :class:`Textbox` object as follows:
 .. sectionauthor:: Eric Raymond <esr@thyrsus.com>
 
 
-.. versionadded:: 1.6
-
 This module supplies one function, :func:`wrapper`, which runs another function
 which should be the rest of your curses-using application.  If the application
 raises an exception, :func:`wrapper` will restore the terminal to a sane state
diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
index 24d4f69..87cccf6 100644
--- a/Doc/library/datetime.rst
+++ b/Doc/library/datetime.rst
@@ -11,8 +11,6 @@
 .. sectionauthor:: A.M. Kuchling <amk@amk.ca>
 
 
-.. versionadded:: 2.3
-
 The :mod:`datetime` module supplies classes for manipulating dates and times in
 both simple and complex ways.  While date and time arithmetic is supported, the
 focus of the implementation is on efficient member extraction for output
@@ -604,7 +602,6 @@ Other constructors, all class methods:
    can't be parsed by :func:`time.strptime` or if it returns a value which isn't a
    time tuple.
 
-   .. versionadded:: 2.5
 
 Class attributes:
 
diff --git a/Doc/library/decimal.rst b/Doc/library/decimal.rst
index 1d17109..498c2cc 100644
--- a/Doc/library/decimal.rst
+++ b/Doc/library/decimal.rst
@@ -5,19 +5,14 @@
 .. module:: decimal
    :synopsis: Implementation of the General Decimal Arithmetic  Specification.
 
-
 .. moduleauthor:: Eric Price <eprice at tjhsst.edu>
 .. moduleauthor:: Facundo Batista <facundo at taniquetil.com.ar>
 .. moduleauthor:: Raymond Hettinger <python at rcn.com>
 .. moduleauthor:: Aahz <aahz at pobox.com>
 .. moduleauthor:: Tim Peters <tim.one at comcast.net>
-
-
 .. sectionauthor:: Raymond D. Hettinger <python at rcn.com>
 
 
-.. versionadded:: 2.4
-
 The :mod:`decimal` module provides support for decimal floating point
 arithmetic.  It offers several advantages over the :class:`float()` datatype:
 
@@ -436,8 +431,6 @@ the :func:`localcontext` function to temporarily change the active context.
    when exiting the with-statement. If no context is specified, a copy of the
    current context is used.
 
-   .. versionadded:: 2.5
-
    For example, the following code sets the current decimal precision to 42 places,
    performs a calculation, and then automatically restores the previous context::
 
diff --git a/Doc/library/difflib.rst b/Doc/library/difflib.rst
index 95b83e6..8d130a1 100644
--- a/Doc/library/difflib.rst
+++ b/Doc/library/difflib.rst
@@ -10,9 +10,6 @@
 
 .. % LaTeXification by Fred L. Drake, Jr. <fdrake@acm.org>.
 
-.. versionadded:: 2.1
-
-
 .. class:: SequenceMatcher
 
    This is a flexible class for comparing pairs of sequences of any type, so long
@@ -117,8 +114,6 @@
    :file:`Tools/scripts/diff.py` is a command-line front-end to this class and
    contains a good example of its use.
 
-   .. versionadded:: 2.4
-
 
 .. function:: context_diff(a, b[, fromfile][, tofile][, fromfiledate][, tofiledate][, n][, lineterm])
 
@@ -146,8 +141,6 @@
 
    :file:`Tools/scripts/diff.py` is a command-line front-end for this function.
 
-   .. versionadded:: 2.3
-
 
 .. function:: get_close_matches(word, possibilities[, n][, cutoff])
 
@@ -263,8 +256,6 @@
 
    :file:`Tools/scripts/diff.py` is a command-line front-end for this function.
 
-   .. versionadded:: 2.3
-
 
 .. function:: IS_LINE_JUNK(line)
 
@@ -382,12 +373,6 @@ use :meth:`set_seq2` to set the commonly used sequence once and call
    then ``i+n != i'`` or ``j+n != j'``; in other words, adjacent triples always
    describe non-adjacent equal blocks.
 
-   .. % Explain why a dummy is used!
-
-   .. versionchanged:: 2.5
-      The guarantee that adjacent triples always describe non-adjacent blocks was
-      implemented.
-
    ::
 
       >>> s = SequenceMatcher(None, "abxcd", "abcd")
@@ -445,8 +430,6 @@ use :meth:`set_seq2` to set the commonly used sequence once and call
 
    The groups are returned in the same format as :meth:`get_opcodes`.
 
-   .. versionadded:: 2.3
-
 
 .. method:: SequenceMatcher.ratio()
 
diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst
index 4f4f511..a448880 100644
--- a/Doc/library/doctest.rst
+++ b/Doc/library/doctest.rst
@@ -290,9 +290,6 @@ strings are treated as if they were docstrings.  In output, a key ``K`` in
 Any classes found are recursively searched similarly, to test docstrings in
 their contained methods and nested classes.
 
-.. versionchanged:: 2.4
-   A "private name" concept is deprecated and no longer documented.
-
 
 .. _doctest-finding-examples:
 
@@ -305,10 +302,6 @@ hard tab characters are expanded to spaces, using 8-column tab stops.  If you
 don't believe tabs should mean that, too bad:  don't use hard tabs, or write
 your own :class:`DocTestParser` class.
 
-.. versionchanged:: 2.4
-   Expanding tabs to spaces is new; previous versions tried to preserve hard tabs,
-   with confusing results.
-
 ::
 
    >>> # comments are ignored
@@ -338,10 +331,6 @@ The fine print:
   blank line, put ``<BLANKLINE>`` in your doctest example each place a blank line
   is expected.
 
-  .. versionchanged:: 2.4
-     ``<BLANKLINE>`` was added; there was no way to use expected output containing
-     empty lines in previous versions.
-
 * Output to stdout is captured, but not output to stderr (exception tracebacks
   are captured via a different means).
 
@@ -498,10 +487,6 @@ Some details you should read once, but won't need to remember:
          ^
      SyntaxError: invalid syntax
 
-.. versionchanged:: 2.4
-   The ability to handle a multi-line exception detail, and the
-   :const:`IGNORE_EXCEPTION_DETAIL` doctest option, were added.
-
 
 .. _doctest-options:
 
@@ -663,7 +648,7 @@ two blanks before the single-digit list elements, and because the actual output
 is on a single line.  This test also passes, and also requires a directive to do
 so::
 
-   >>> print range(20) # doctest:+ELLIPSIS
+   >>> print range(20) # doctest: +ELLIPSIS
    [0, 1, ..., 18, 19]
 
 Multiple directives can be used on a single physical line, separated by commas::
@@ -692,17 +677,6 @@ usually the only meaningful choice.  However, option flags can also be passed to
 functions that run doctests, establishing different defaults.  In such cases,
 disabling an option via ``-`` in a directive can be useful.
 
-.. versionchanged:: 2.4
-   Constants :const:`DONT_ACCEPT_BLANKLINE`, :const:`NORMALIZE_WHITESPACE`,
-   :const:`ELLIPSIS`, :const:`IGNORE_EXCEPTION_DETAIL`, :const:`REPORT_UDIFF`,
-   :const:`REPORT_CDIFF`, :const:`REPORT_NDIFF`,
-   :const:`REPORT_ONLY_FIRST_FAILURE`, :const:`COMPARISON_FLAGS` and
-   :const:`REPORTING_FLAGS` were added; by default ``<BLANKLINE>`` in expected
-   output matches an empty line in actual output; and doctest directives were
-   added.
-
-.. versionchanged:: 2.5
-   Constant :const:`SKIP` was added.
 
 There's also a way to register new option flag names, although this isn't useful
 unless you intend to extend :mod:`doctest` internals via subclassing:
@@ -718,8 +692,6 @@ unless you intend to extend :mod:`doctest` internals via subclassing:
 
       MY_FLAG = register_optionflag('MY_FLAG')
 
-   .. versionadded:: 2.4
-
 
 .. _doctest-warnings:
 
@@ -868,11 +840,6 @@ and :ref:`doctest-simple-testfile`.
    Optional argument *encoding* specifies an encoding that should be used to
    convert the file to unicode.
 
-   .. versionadded:: 2.4
-
-   .. versionchanged:: 2.5
-      The parameter *encoding* was added.
-
 
 .. function:: testmod([m][, name][, globs][, verbose][, report][, optionflags][, extraglobs][, raise_on_error][, exclude_empty])
 
@@ -906,14 +873,6 @@ and :ref:`doctest-simple-testfile`.
    *raise_on_error*, and *globs* are the same as for function :func:`testfile`
    above, except that *globs* defaults to ``m.__dict__``.
 
-   .. versionchanged:: 2.3
-      The parameter *optionflags* was added.
-
-   .. versionchanged:: 2.4
-      The parameters *extraglobs*, *raise_on_error* and *exclude_empty* were added.
-
-   .. versionchanged:: 2.5
-      The optional argument *isprivate*, deprecated in 2.4, was removed.
 
 There's also a function to run the doctests associated with a single object.
 This function is provided for backward compatibility.  There are no plans to
@@ -1031,14 +990,8 @@ from text files and modules with doctests:
    Optional argument *encoding* specifies an encoding that should be used to
    convert the file to unicode.
 
-   .. versionadded:: 2.4
-
-   .. versionchanged:: 2.5
-      The global ``__file__`` was added to the globals provided to doctests loaded
-      from a text file using :func:`DocFileSuite`.
-
-   .. versionchanged:: 2.5
-      The parameter *encoding* was added.
+   The global ``__file__`` is added to the globals provided to doctests loaded
+   from a text file using :func:`DocFileSuite`.
 
 
 .. function:: DocTestSuite([module][, globs][, extraglobs][, test_finder][, setUp][, tearDown][, checker])
@@ -1068,12 +1021,8 @@ from text files and modules with doctests:
    Optional arguments *setUp*, *tearDown*, and *optionflags* are the same as for
    function :func:`DocFileSuite` above.
 
-   .. versionadded:: 2.3
+   This function uses the same search technique as :func:`testmod`.
 
-   .. versionchanged:: 2.4
-      The parameters *globs*, *extraglobs*, *test_finder*, *setUp*, *tearDown*, and
-      *optionflags* were added; this function now uses the same search technique as
-      :func:`testmod`.
 
 Under the covers, :func:`DocTestSuite` creates a :class:`unittest.TestSuite` out
 of :class:`doctest.DocTestCase` instances, and :class:`DocTestCase` is a
@@ -1119,8 +1068,6 @@ reporting flags specific to :mod:`unittest` support, via this function:
    The value of the :mod:`unittest` reporting flags in effect before the function
    was called is returned by the function.
 
-   .. versionadded:: 2.4
-
 
 .. _doctest-advanced-api:
 
@@ -1181,7 +1128,6 @@ DocTest Objects
    constructor arguments are used to initialize the member variables of the same
    names.
 
-   .. versionadded:: 2.4
 
 :class:`DocTest` defines the following member variables.  They are initialized
 by the constructor, and should not be modified directly.
@@ -1239,7 +1185,6 @@ Example Objects
    output.  The constructor arguments are used to initialize the member variables
    of the same names.
 
-   .. versionadded:: 2.4
 
 :class:`Example` defines the following member variables.  They are initialized
 by the constructor, and should not be modified directly.
@@ -1316,7 +1261,6 @@ DocTestFinder objects
    If the optional argument *exclude_empty* is false, then
    :meth:`DocTestFinder.find` will include tests for objects with empty docstrings.
 
-   .. versionadded:: 2.4
 
 :class:`DocTestFinder` defines the following method:
 
@@ -1369,7 +1313,6 @@ DocTestParser objects
    A processing class used to extract interactive examples from a string, and use
    them to create a :class:`DocTest` object.
 
-   .. versionadded:: 2.4
 
 :class:`DocTestParser` defines the following methods:
 
@@ -1438,7 +1381,6 @@ DocTestRunner objects
    runner compares expected output to actual output, and how it displays failures.
    For more information, see section :ref:`doctest-options`.
 
-   .. versionadded:: 2.4
 
 :class:`DocTestParser` defines the following methods:
 
@@ -1530,11 +1472,9 @@ OutputChecker objects
    if they match; and :meth:`output_difference`, which returns a string describing
    the differences between two outputs.
 
-   .. versionadded:: 2.4
 
 :class:`OutputChecker` defines the following methods:
 
-
 .. method:: OutputChecker.check_output(want, got, optionflags)
 
    Return ``True`` iff the actual output from an example (*got*) matches the
@@ -1616,8 +1556,6 @@ Doctest provides several mechanisms for debugging doctest examples:
      (0, 3)
      >>>
 
-  .. versionchanged:: 2.4
-     The ability to use :func:`pdb.set_trace` usefully inside doctests was added.
 
 Functions that convert doctests to Python code, and possibly run the synthesized
 code under the debugger:
@@ -1656,8 +1594,6 @@ code under the debugger:
    useful when you want to transform an interactive Python session into a Python
    script.
 
-   .. versionadded:: 2.4
-
 
 .. function:: testsource(module, name)
 
@@ -1676,8 +1612,6 @@ code under the debugger:
    prints a script version of function :func:`f`'s docstring, with doctests
    converted to code, and the rest placed in comments.
 
-   .. versionadded:: 2.3
-
 
 .. function:: debug(module, name[, pm])
 
@@ -1699,11 +1633,6 @@ code under the debugger:
    specified, or is false, the script is run under the debugger from the start, via
    passing an appropriate :func:`exec` call to :func:`pdb.run`.
 
-   .. versionadded:: 2.3
-
-   .. versionchanged:: 2.4
-      The *pm* argument was added.
-
 
 .. function:: debug_src(src[, pm][, globs])
 
@@ -1718,7 +1647,6 @@ code under the debugger:
    execution context.  If not specified, or ``None``, an empty dictionary is used.
    If specified, a shallow copy of the dictionary is used.
 
-   .. versionadded:: 2.4
 
 The :class:`DebugRunner` class, and the special exceptions it may raise, are of
 most interest to testing framework authors, and will only be sketched here.  See
diff --git a/Doc/library/docxmlrpcserver.rst b/Doc/library/docxmlrpcserver.rst
index 958ea95..8169684 100644
--- a/Doc/library/docxmlrpcserver.rst
+++ b/Doc/library/docxmlrpcserver.rst
@@ -8,8 +8,6 @@
 .. sectionauthor:: Brian Quinlan <brianq@activestate.com>
 
 
-.. versionadded:: 2.3
-
 The :mod:`DocXMLRPCServer` module extends the classes found in
 :mod:`SimpleXMLRPCServer` to serve HTML documentation in response to HTTP GET
 requests. Servers can either be free standing, using :class:`DocXMLRPCServer`,
diff --git a/Doc/library/dumbdbm.rst b/Doc/library/dumbdbm.rst
index 3db9fda..4e91ac9 100644
--- a/Doc/library/dumbdbm.rst
+++ b/Doc/library/dumbdbm.rst
@@ -43,9 +43,6 @@ The module defines the following:
    database has to be created.  It defaults to octal ``0666`` (and will be modified
    by the prevailing umask).
 
-   .. versionchanged:: 2.2
-      The *mode* argument was ignored in earlier versions.
-
 
 .. seealso::
 
diff --git a/Doc/library/easydialogs.rst b/Doc/library/easydialogs.rst
index 50b312f..dbc996c 100644
--- a/Doc/library/easydialogs.rst
+++ b/Doc/library/easydialogs.rst
@@ -96,8 +96,6 @@ The :mod:`EasyDialogs` module defines the following functions:
    chosen, the text of *cmdstr* will be appended to the command line as is, except
    that a trailing ``':'`` or ``'='`` (if present) will be trimmed off.
 
-   .. versionadded:: 2.0
-
 
 .. function:: AskFileForOpen( [message] [, typeList] [, defaultLocation] [, defaultOptionFlags] [, location] [, clientName] [, windowTitle] [, actionButtonLabel] [, cancelButtonLabel] [, preferenceKey] [, popupExtension] [, eventProc] [, previewProc] [, filterProc] [, wanted] )
 
@@ -150,9 +148,6 @@ Both determinate (thermometer style) and indeterminate (barber-pole style)
 progress bars are supported.  The bar will be determinate if its maximum value
 is greater than zero; otherwise it will be indeterminate.
 
-.. versionchanged:: 2.2
-   Support for indeterminate-style progress bars was added.
-
 The dialog is displayed immediately after creation. If the dialog's "Cancel"
 button is pressed, or if :kbd:`Cmd-.` or :kbd:`ESC` is typed, the dialog window
 is hidden and :exc:`KeyboardInterrupt` is raised (but note that this response
diff --git a/Doc/library/email.charset.rst b/Doc/library/email.charset.rst
index d16d281..a943fc2 100644
--- a/Doc/library/email.charset.rst
+++ b/Doc/library/email.charset.rst
@@ -13,8 +13,6 @@ Instances of :class:`Charset` are used in several other modules within the
 
 Import this class from the :mod:`email.charset` module.
 
-.. versionadded:: 2.2.2
-
 
 .. class:: Charset([input_charset])
 
diff --git a/Doc/library/email.errors.rst b/Doc/library/email.errors.rst
index 916d2a5..c68262f 100644
--- a/Doc/library/email.errors.rst
+++ b/Doc/library/email.errors.rst
@@ -66,9 +66,6 @@ object would have a defect, but the containing messages would not.
 All defect classes are subclassed from :class:`email.errors.MessageDefect`, but
 this class is *not* an exception!
 
-.. versionadded:: 2.4
-   All the defect classes were added.
-
 * :class:`NoBoundaryInMultipartDefect` -- A message claimed to be a multipart,
   but had no :mimetype:`boundary` parameter.
 
diff --git a/Doc/library/email.generator.rst b/Doc/library/email.generator.rst
index bb1f57d..c12dc2f 100644
--- a/Doc/library/email.generator.rst
+++ b/Doc/library/email.generator.rst
@@ -61,16 +61,12 @@ The other public :class:`Generator` methods are:
 
    Note that for subparts, no envelope header is ever printed.
 
-   .. versionadded:: 2.2.2
-
 
 .. method:: Generator.clone(fp)
 
    Return an independent clone of this :class:`Generator` instance with the exact
    same options.
 
-   .. versionadded:: 2.2.2
-
 
 .. method:: Generator.write(s)
 
@@ -115,9 +111,3 @@ representing the part.
    The default value for *fmt* is ``None``, meaning ::
 
       [Non-text (%(type)s) part of message omitted, filename %(filename)s]
-
-   .. versionadded:: 2.2.2
-
-.. versionchanged:: 2.5
-   The previously deprecated method :meth:`__call__` was removed.
-
diff --git a/Doc/library/email.header.rst b/Doc/library/email.header.rst
index 0ecd35f..fb2496a 100644
--- a/Doc/library/email.header.rst
+++ b/Doc/library/email.header.rst
@@ -43,8 +43,6 @@ the character set that the byte string was encoded in.  When the subsequent
 properly :rfc:`2047` encoded.  MIME-aware mail readers would show this header
 using the embedded ISO-8859-1 character.
 
-.. versionadded:: 2.2.2
-
 Here is the :class:`Header` class description:
 
 
diff --git a/Doc/library/email.message.rst b/Doc/library/email.message.rst
index e1fb20e..871a5f8 100644
--- a/Doc/library/email.message.rst
+++ b/Doc/library/email.message.rst
@@ -116,9 +116,6 @@ Here are the methods of the :class:`Message` class:
    responsibility to ensure the payload invariants.  Optional *charset* sets the
    message's default character set; see :meth:`set_charset` for details.
 
-   .. versionchanged:: 2.2.2
-      *charset* argument added.
-
 
 .. method:: Message.set_charset(charset)
 
@@ -136,15 +133,11 @@ Here are the methods of the :class:`Message` class:
    :mailheader:`Content-Type`, :mailheader:`Content-Transfer-Encoding`) will be
    added as needed.
 
-   .. versionadded:: 2.2.2
-
 
 .. method:: Message.get_charset()
 
    Return the :class:`Charset` instance associated with the message's payload.
 
-   .. versionadded:: 2.2.2
-
 The following methods implement a mapping-like interface for accessing the
 message's :rfc:`2822` headers.  Note that there are some semantic differences
 between these methods and a normal mapping (i.e. dictionary) interface.  For
@@ -270,8 +263,6 @@ Here are some additional useful methods:
    *_name*, retaining header order and field name case.  If no matching header was
    found, a :exc:`KeyError` is raised.
 
-   .. versionadded:: 2.2.2
-
 
 .. method:: Message.get_content_type()
 
@@ -288,24 +279,18 @@ Here are some additional useful methods:
    has an invalid type specification, :rfc:`2045` mandates that the default type be
    :mimetype:`text/plain`.
 
-   .. versionadded:: 2.2.2
-
 
 .. method:: Message.get_content_maintype()
 
    Return the message's main content type.  This is the :mimetype:`maintype` part
    of the string returned by :meth:`get_content_type`.
 
-   .. versionadded:: 2.2.2
-
 
 .. method:: Message.get_content_subtype()
 
    Return the message's sub-content type.  This is the :mimetype:`subtype` part of
    the string returned by :meth:`get_content_type`.
 
-   .. versionadded:: 2.2.2
-
 
 .. method:: Message.get_default_type()
 
@@ -314,8 +299,6 @@ Here are some additional useful methods:
    :mimetype:`multipart/digest` containers.  Such subparts have a default content
    type of :mimetype:`message/rfc822`.
 
-   .. versionadded:: 2.2.2
-
 
 .. method:: Message.set_default_type(ctype)
 
@@ -323,8 +306,6 @@ Here are some additional useful methods:
    or :mimetype:`message/rfc822`, although this is not enforced.  The default
    content type is not stored in the :mailheader:`Content-Type` header.
 
-   .. versionadded:: 2.2.2
-
 
 .. method:: Message.get_params([failobj[, header[, unquote]]])
 
@@ -339,9 +320,6 @@ Here are some additional useful methods:
    :mailheader:`Content-Type` header.  Optional *header* is the header to search
    instead of :mailheader:`Content-Type`.
 
-   .. versionchanged:: 2.2.2
-      *unquote* argument added.
-
 
 .. method:: Message.get_param(param[, failobj[, header[, unquote]]])
 
@@ -371,9 +349,6 @@ Here are some additional useful methods:
    In any case, the parameter value (either the returned string, or the ``VALUE``
    item in the 3-tuple) is always unquoted, unless *unquote* is set to ``False``.
 
-   .. versionchanged:: 2.2.2
-      *unquote* argument added, and 3-tuple return value possible.
-
 
 .. method:: Message.set_param(param, value[, header[, requote[, charset[, language]]]])
 
@@ -391,8 +366,6 @@ Here are some additional useful methods:
    :rfc:`2231`. Optional *language* specifies the RFC 2231 language, defaulting to
    the empty string.  Both *charset* and *language* should be strings.
 
-   .. versionadded:: 2.2.2
-
 
 .. method:: Message.del_param(param[, header[, requote]])
 
@@ -402,8 +375,6 @@ Here are some additional useful methods:
    (the default is ``True``).  Optional *header* specifies an alternative to
    :mailheader:`Content-Type`.
 
-   .. versionadded:: 2.2.2
-
 
 .. method:: Message.set_type(type[, header][, requote])
 
@@ -419,8 +390,6 @@ Here are some additional useful methods:
    :mailheader:`Content-Type` header is set a :mailheader:`MIME-Version` header is
    also added.
 
-   .. versionadded:: 2.2.2
-
 
 .. method:: Message.get_filename([failobj])
 
@@ -464,8 +433,6 @@ Here are some additional useful methods:
    Note that this method differs from :meth:`get_charset` which returns the
    :class:`Charset` instance for the default encoding of the message body.
 
-   .. versionadded:: 2.2.2
-
 
 .. method:: Message.get_charsets([failobj])
 
@@ -499,10 +466,6 @@ Here are some additional useful methods:
       text/plain
       message/rfc822
 
-.. versionchanged:: 2.5
-   The previously deprecated methods :meth:`get_type`, :meth:`get_main_type`, and
-   :meth:`get_subtype` were removed.
-
 :class:`Message` objects can also optionally contain two instance attributes,
 which can be used when generating the plain text of a MIME message.
 
@@ -533,9 +496,8 @@ which can be used when generating the plain text of a MIME message.
    that it contains text that appears between the last boundary and the end of the
    message.
 
-   .. versionchanged:: 2.5
-      You do not need to set the epilogue to the empty string in order for the
-      :class:`Generator` to print a newline at the end of the file.
+   You do not need to set the epilogue to the empty string in order for the
+   :class:`Generator` to print a newline at the end of the file.
 
 
 .. data:: defects
@@ -543,6 +505,3 @@ which can be used when generating the plain text of a MIME message.
    The *defects* attribute contains a list of all the problems found when parsing
    this message.  See :mod:`email.errors` for a detailed description of the
    possible parsing defects.
-
-   .. versionadded:: 2.4
-
diff --git a/Doc/library/email.mime.rst b/Doc/library/email.mime.rst
index 6f1b0ae..13bd100 100644
--- a/Doc/library/email.mime.rst
+++ b/Doc/library/email.mime.rst
@@ -49,8 +49,6 @@ Here are the classes:
    :mimetype:`multipart` messages.  If :meth:`attach` is called, a
    :exc:`MultipartConversionError` exception is raised.
 
-   .. versionadded:: 2.2.2
-
 
 .. class:: MIMEMultipart([subtype[, boundary[, _subparts[, _params]]]])
 
@@ -74,8 +72,6 @@ Here are the classes:
    the keyword arguments, or passed into the *_params* argument, which is a keyword
    dictionary.
 
-   .. versionadded:: 2.2.2
-
 
 .. class:: MIMEApplication(_data[, _subtype[, _encoder[, **_params]]])
 
@@ -96,8 +92,6 @@ Here are the classes:
 
    *_params* are passed straight through to the base class constructor.
 
-   .. versionadded:: 2.5
-
 
 .. class:: MIMEAudio(_audiodata[, _subtype[, _encoder[, **_params]]])
 
@@ -169,7 +163,3 @@ Here are the classes:
    :class:`MIMENonMultipart` constructor; it defaults to ``us-ascii``.  No guessing
    or encoding is performed on the text data.
 
-   .. versionchanged:: 2.4
-      The previously deprecated *_encoding* argument has been removed.  Encoding
-      happens implicitly based on the *_charset* argument.
-
diff --git a/Doc/library/email.parser.rst b/Doc/library/email.parser.rst
index 048ed22..6d623a7 100644
--- a/Doc/library/email.parser.rst
+++ b/Doc/library/email.parser.rst
@@ -38,8 +38,6 @@ any way it finds necessary.
 FeedParser API
 ^^^^^^^^^^^^^^
 
-.. versionadded:: 2.4
-
 The :class:`FeedParser`, imported from the :mod:`email.feedparser` module,
 provides an API that is conducive to incremental parsing of email messages, such
 as would be necessary when reading the text of an email message from a source
@@ -113,12 +111,6 @@ class.
       effectively non-strict.  You should simply stop passing a *strict* flag to
       the :class:`Parser` constructor.
 
-   .. versionchanged:: 2.2.2
-      The *strict* flag was added.
-
-   .. versionchanged:: 2.4
-      The *strict* flag was deprecated.
-
 The other public :class:`Parser` methods are:
 
 
@@ -136,9 +128,6 @@ The other public :class:`Parser` methods are:
 
    Optional *headersonly* is as with the :meth:`parse` method.
 
-   .. versionchanged:: 2.2.2
-      The *headersonly* flag was added.
-
 
 .. method:: Parser.parsestr(text[, headersonly])
 
@@ -150,8 +139,6 @@ The other public :class:`Parser` methods are:
    reading the headers or not.  The default is ``False``, meaning it parses the
    entire contents of the file.
 
-   .. versionchanged:: 2.2.2
-      The *headersonly* flag was added.
 
 Since creating a message object structure from a string or a file object is such
 a common task, two functions are provided as a convenience.  They are available
@@ -164,9 +151,6 @@ in the top-level :mod:`email` package namespace.
    ``Parser().parsestr(s)``.  Optional *_class* and *strict* are interpreted as
    with the :class:`Parser` class constructor.
 
-   .. versionchanged:: 2.2.2
-      The *strict* flag was added.
-
 
 .. function:: message_from_file(fp[, _class[, strict]])
 
@@ -174,9 +158,6 @@ in the top-level :mod:`email` package namespace.
    exactly equivalent to ``Parser().parse(fp)``.  Optional *_class* and *strict*
    are interpreted as with the :class:`Parser` class constructor.
 
-   .. versionchanged:: 2.2.2
-      The *strict* flag was added.
-
 Here's an example of how you might use this at an interactive Python prompt::
 
    >>> import email
diff --git a/Doc/library/email.rst b/Doc/library/email.rst
index 212c321..df41563 100644
--- a/Doc/library/email.rst
+++ b/Doc/library/email.rst
@@ -12,8 +12,6 @@
 .. sectionauthor:: Barry A. Warsaw <barry@python.org>
 
 
-.. versionadded:: 2.2
-
 The :mod:`email` package is a library for managing email messages, including
 MIME and other :rfc:`2822`\ -based message documents.  It subsumes most of the
 functionality in several older standard modules such as :mod:`rfc822`,
diff --git a/Doc/library/email.util.rst b/Doc/library/email.util.rst
index aa67885..2396fb7 100644
--- a/Doc/library/email.util.rst
+++ b/Doc/library/email.util.rst
@@ -104,8 +104,6 @@ There are several useful utilities provided in the :mod:`email.utils` module:
    needed for some protocols (such as HTTP). This only applies when *localtime* is
    ``False``.
 
-   .. versionadded:: 2.4
-
 
 .. function:: make_msgid([idstring])
 
@@ -146,17 +144,6 @@ There are several useful utilities provided in the :mod:`email.utils` module:
    Decode parameters list according to :rfc:`2231`.  *params* is a sequence of
    2-tuples containing elements of the form ``(content-type, string-value)``.
 
-.. versionchanged:: 2.4
-   The :func:`dump_address_pair` function has been removed; use :func:`formataddr`
-   instead.
-
-.. versionchanged:: 2.4
-   The :func:`decode` function has been removed; use the
-   :meth:`Header.decode_header` method instead.
-
-.. versionchanged:: 2.4
-   The :func:`encode` function has been removed; use the :meth:`Header.encode`
-   method instead.
 
 .. rubric:: Footnotes
 
diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst
index 808e26a..989eb9d 100644
--- a/Doc/library/exceptions.rst
+++ b/Doc/library/exceptions.rst
@@ -56,17 +56,12 @@ The following exceptions are only used as base classes for other exceptions.
    string when there were no arguments.  All arguments are  stored in :attr:`args`
    as a tuple.
 
-   .. versionadded:: 2.5
-
 
 .. exception:: Exception
 
    All built-in, non-system-exiting exceptions are derived from this class.  All
    user-defined exceptions should also be derived from this class.
 
-   .. versionchanged:: 2.5
-      Changed to inherit from :exc:`BaseException`.
-
 
 .. exception:: ArithmeticError
 
@@ -91,8 +86,6 @@ The following exceptions are only used as base classes for other exceptions.
    :attr:`strerror` attribute (it is usually the associated error message).  The
    tuple itself is also available on the :attr:`args` attribute.
 
-   .. versionadded:: 1.5.2
-
    When an :exc:`EnvironmentError` exception is instantiated with a 3-tuple, the
    first two items are available as above, while the third item is available on the
    :attr:`filename` attribute.  However, for backwards compatibility, the
@@ -143,11 +136,6 @@ The following exceptions are the exceptions that are actually raised.
 
    Raise when a generator's :meth:`close` method is called.
 
-   .. versionadded:: 2.5
-
-   .. versionchanged:: 3.0
-      Changed to inherit from Exception instead of StandardError.
-
 
 .. exception:: IOError
 
@@ -189,9 +177,6 @@ The following exceptions are the exceptions that are actually raised.
    accidentally caught by code that catches :exc:`Exception` and thus prevent
    the interpreter from exiting.
 
-   .. versionchanged:: 2.5
-      Changed to inherit from :exc:`BaseException`.
-
 
 .. exception:: MemoryError
 
@@ -217,8 +202,6 @@ The following exceptions are the exceptions that are actually raised.
    classes, abstract methods should raise this exception when they require derived
    classes to override the method.
 
-   .. versionadded:: 1.5.2
-
 
 .. exception:: OSError
 
@@ -226,10 +209,6 @@ The following exceptions are the exceptions that are actually raised.
    :mod:`os` module's ``os.error`` exception. See :exc:`EnvironmentError` above for
    a description of the possible associated values.
 
-   .. % xref for os module
-
-   .. versionadded:: 1.5.2
-
 
 .. exception:: OverflowError
 
@@ -247,9 +226,6 @@ The following exceptions are the exceptions that are actually raised.
    after it has been garbage collected. For more information on weak references,
    see the :mod:`weakref` module.
 
-   .. versionadded:: 2.2
-      Previously known as the :exc:`weakref.ReferenceError` exception.
-
 
 .. exception:: RuntimeError
 
@@ -264,11 +240,6 @@ The following exceptions are the exceptions that are actually raised.
    Raised by builtin :func:`next` and an iterator's :meth:`__next__` method to
    signal that there are no further values.
 
-   .. versionadded:: 2.2
-
-   .. versionchanged:: 3.0
-      Changed to inherit from Exception instead of StandardError.
-
 
 .. exception:: SyntaxError
 
@@ -320,9 +291,6 @@ The following exceptions are the exceptions that are actually raised.
    that it is not accidentally caught by code that catches :exc:`Exception`.  This
    allows the exception to properly propagate up and cause the interpreter to exit.
 
-   .. versionchanged:: 2.5
-      Changed to inherit from :exc:`BaseException`.
-
 
 .. exception:: TypeError
 
@@ -336,40 +304,30 @@ The following exceptions are the exceptions that are actually raised.
    no value has been bound to that variable.  This is a subclass of
    :exc:`NameError`.
 
-   .. versionadded:: 2.0
-
 
 .. exception:: UnicodeError
 
    Raised when a Unicode-related encoding or decoding error occurs.  It is a
    subclass of :exc:`ValueError`.
 
-   .. versionadded:: 2.0
-
 
 .. exception:: UnicodeEncodeError
 
    Raised when a Unicode-related error occurs during encoding.  It is a subclass of
    :exc:`UnicodeError`.
 
-   .. versionadded:: 2.3
-
 
 .. exception:: UnicodeDecodeError
 
    Raised when a Unicode-related error occurs during decoding.  It is a subclass of
    :exc:`UnicodeError`.
 
-   .. versionadded:: 2.3
-
 
 .. exception:: UnicodeTranslateError
 
    Raised when a Unicode-related error occurs during translating.  It is a subclass
    of :exc:`UnicodeError`.
 
-   .. versionadded:: 2.3
-
 
 .. exception:: ValueError
 
@@ -387,11 +345,6 @@ The following exceptions are the exceptions that are actually raised.
    Platform API. The :attr:`errno` value maps the :attr:`winerror` value to
    corresponding ``errno.h`` values. This is a subclass of :exc:`OSError`.
 
-   .. versionadded:: 2.0
-
-   .. versionchanged:: 2.5
-      Previous versions put the :cfunc:`GetLastError` codes into :attr:`errno`.
-
 
 .. exception:: ZeroDivisionError
 
@@ -443,15 +396,11 @@ module for more information.
 
    Base class for warnings about probable mistakes in module imports.
 
-   .. versionadded:: 2.5
-
 
 .. exception:: UnicodeWarning
 
    Base class for warnings related to Unicode.
 
-   .. versionadded:: 2.5
-
 The class hierarchy for built-in exceptions is:
 
 
diff --git a/Doc/library/fileinput.rst b/Doc/library/fileinput.rst
index d45def1..ba7e980 100644
--- a/Doc/library/fileinput.rst
+++ b/Doc/library/fileinput.rst
@@ -53,8 +53,6 @@ The following function is the primary interface of this module:
    during iteration.  The parameters to this function will be passed along to the
    constructor of the :class:`FileInput` class.
 
-   .. versionchanged:: 2.5
-      Added the *mode* and *openhook* parameters.
 
 The following functions use the global state created by :func:`fileinput.input`;
 if there is no active state, :exc:`RuntimeError` is raised.
@@ -71,8 +69,6 @@ if there is no active state, :exc:`RuntimeError` is raised.
    Return the integer "file descriptor" for the current file. When no file is
    opened (before the first line and between files), returns ``-1``.
 
-   .. versionadded:: 2.5
-
 
 .. function:: lineno()
 
@@ -135,8 +131,6 @@ available for subclassing as well:
    *filename* and *mode*, and returns an accordingly opened file-like object. You
    cannot use *inplace* and *openhook* together.
 
-   .. versionchanged:: 2.5
-      Added the *mode* and *openhook* parameters.
 
 **Optional in-place filtering:** if the keyword argument ``inplace=1`` is passed
 to :func:`fileinput.input` or to the :class:`FileInput` constructor, the file is
@@ -165,8 +159,6 @@ The two following opening hooks are provided by this module:
 
    Usage example:  ``fi = fileinput.FileInput(openhook=fileinput.hook_compressed)``
 
-   .. versionadded:: 2.5
-
 
 .. function:: hook_encoded(encoding)
 
@@ -181,5 +173,3 @@ The two following opening hooks are provided by this module:
       With this hook, :class:`FileInput` might return Unicode strings depending on the
       specified *encoding*.
 
-   .. versionadded:: 2.5
-
diff --git a/Doc/library/fnmatch.rst b/Doc/library/fnmatch.rst
index 244bad9..6ce5a1c 100644
--- a/Doc/library/fnmatch.rst
+++ b/Doc/library/fnmatch.rst
@@ -65,8 +65,6 @@ patterns.
    Return the subset of the list of *names* that match *pattern*. It is the same as
    ``[n for n in names if fnmatch(n, pattern)]``, but implemented more efficiently.
 
-   .. versionadded:: 2.2
-
 
 .. function:: translate(pattern)
 
diff --git a/Doc/library/ftplib.rst b/Doc/library/ftplib.rst
index 60e88cf..2c06ac7 100644
--- a/Doc/library/ftplib.rst
+++ b/Doc/library/ftplib.rst
@@ -46,9 +46,6 @@ The module defines the following items:
    specifies a timeout in seconds for the connection attempt (if is not specified,
    or passed as None, the global default timeout setting will be used).
 
-   .. versionchanged:: 2.6
-      *timeout* was added.
-
 
 .. data:: all_errors
 
@@ -128,9 +125,6 @@ followed by ``lines`` for the text version or ``binary`` for the binary version.
    is used (the timeout that you passed when instantiating the class); if the
    object timeout is also None, the global default timeout  setting will be used.
 
-   .. versionchanged:: 2.6
-      *timeout* was added.
-
 
 .. method:: FTP.getwelcome()
 
@@ -203,9 +197,6 @@ followed by ``lines`` for the text version or ``binary`` for the binary version.
    read until EOF using its :meth:`read` method in blocks of size *blocksize* to
    provide the data to be stored.  The *blocksize* argument defaults to 8192.
 
-   .. versionchanged:: 2.1
-      default for *blocksize* added.
-
 
 .. method:: FTP.storlines(command, file)
 
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 7390fd4..ff16536 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -12,8 +12,6 @@ available.  They are listed here in alphabetical order.
 
    .. index::
       statement: import
-      module: ihooks
-      module: rexec
       module: imp
 
    .. note::
@@ -23,9 +21,9 @@ available.  They are listed here in alphabetical order.
 
    The function is invoked by the :keyword:`import` statement.  It mainly exists
    so that you can replace it with another function that has a compatible
-   interface, in order to change the semantics of the :keyword:`import` statement.
-   For examples of why and how you would do this, see the standard library modules
-   :mod:`ihooks` and :mod:`rexec`.  See also the built-in module :mod:`imp`, which
+   interface, in order to change the semantics of the :keyword:`import`
+   statement.  For examples of why and how you would do this, see the standard
+   library module :mod:`ihooks`.  See also the built-in module :mod:`imp`, which
    defines some useful operations out of which you can build your own
    :func:`__import__` function.
 
@@ -64,12 +62,6 @@ available.  They are listed here in alphabetical order.
    the number of parent directories to search relative to the directory of the
    module calling :func:`__import__`.
 
-   .. versionchanged:: 2.5
-      The level parameter was added.
-
-   .. versionchanged:: 2.5
-      Keyword support for parameters was added.
-
 
 .. function:: abs(x)
 
@@ -88,8 +80,6 @@ available.  They are listed here in alphabetical order.
                   return False
           return True
 
-   .. versionadded:: 2.5
-
 
 .. function:: any(iterable)
 
@@ -101,8 +91,6 @@ available.  They are listed here in alphabetical order.
                   return True
           return False
 
-   .. versionadded:: 2.5
-
 
 .. function:: basestring()
 
@@ -111,8 +99,6 @@ available.  They are listed here in alphabetical order.
    is an instance of :class:`str` (or a user-defined type inherited from
    :class:`basestring`).
 
-   .. versionadded:: 2.3
-
 
 .. function:: bin(x)
 
@@ -120,8 +106,6 @@ available.  They are listed here in alphabetical order.
    expression.  If *x* is not a Python :class:`int` object, it has to define an
    :meth:`__index__` method that returns an integer.
 
-   .. versionadded:: 3.0
-
 
 .. function:: bool([x])
 
@@ -133,11 +117,6 @@ available.  They are listed here in alphabetical order.
 
    .. index:: pair: Boolean; type
 
-   .. versionadded:: 2.2.1
-
-   .. versionchanged:: 2.3
-      If no argument is given, this function returns :const:`False`.
-
 
 .. function:: bytes([arg[, encoding[, errors]]])
 
@@ -199,11 +178,6 @@ available.  They are listed here in alphabetical order.
    For more information on class methods, consult the documentation on the standard
    type hierarchy in :ref:`types`.
 
-   .. versionadded:: 2.2
-
-   .. versionchanged:: 2.4
-      Function decorator syntax added.
-
 
 .. function:: cmp(x, y)
 
@@ -340,9 +314,6 @@ available.  They are listed here in alphabetical order.
    *a*, if ``a % b`` is non-zero it has the same sign as *b*, and ``0 <= abs(a % b)
    < abs(b)``.
 
-   .. versionchanged:: 2.3
-      Using :func:`divmod` with complex numbers is deprecated.
-
 
 .. function:: enumerate(iterable)
 
@@ -360,8 +331,6 @@ available.  They are listed here in alphabetical order.
       2 Fall
       3 Winter
 
-   .. versionadded:: 2.3
-
 
 .. function:: eval(expression[, globals[, locals]])
 
@@ -369,9 +338,6 @@ available.  They are listed here in alphabetical order.
    *globals* must be a dictionary.  If provided, *locals* can be any mapping
    object.
 
-   .. versionchanged:: 2.4
-      formerly *locals* was required to be a dictionary.
-
    The *expression* argument is parsed and evaluated as a Python expression
    (technically speaking, a condition list) using the *globals* and *locals*
    dictionaries as global and local name space.  If the *globals* dictionary is
@@ -499,8 +465,6 @@ available.  They are listed here in alphabetical order.
    For other containers see the built in :class:`dict`, :class:`list`, and
    :class:`tuple` classes, and the :mod:`collections` module.
 
-   .. versionadded:: 2.4
-
 
 .. function:: getattr(object, name[, default])
 
@@ -543,8 +507,6 @@ available.  They are listed here in alphabetical order.
    topic, and a help page is printed on the console.  If the argument is any other
    kind of object, a help page on the object is generated.
 
-   .. versionadded:: 2.2
-
 
 .. function:: hex(x)
 
@@ -552,9 +514,6 @@ available.  They are listed here in alphabetical order.
    expression.  If *x* is not a Python :class:`int` object, it has to define an
    :meth:`__index__` method that returns an integer.
 
-   .. versionchanged:: 2.4
-      Formerly only returned an unsigned literal.
-
 
 .. function:: id(object)
 
@@ -590,9 +549,6 @@ available.  They are listed here in alphabetical order.
    accepted).  If *classinfo* is not a type or tuple of types and such tuples,
    a :exc:`TypeError` exception is raised.
 
-   .. versionchanged:: 2.2
-      Support for a tuple of type information was added.
-
 
 .. function:: issubclass(class, classinfo)
 
@@ -601,9 +557,6 @@ available.  They are listed here in alphabetical order.
    objects, in which case every entry in *classinfo* will be checked. In any other
    case, a :exc:`TypeError` exception is raised.
 
-   .. versionchanged:: 2.3
-      Support for a tuple of type information was added.
-
 
 .. function:: iter(o[, sentinel])
 
@@ -618,8 +571,6 @@ available.  They are listed here in alphabetical order.
    its :meth:`__next__` method; if the value returned is equal to *sentinel*,
    :exc:`StopIteration` will be raised, otherwise the value will be returned.
 
-   .. versionadded:: 2.2
-
 
 .. function:: len(s)
 
@@ -668,18 +619,14 @@ available.  They are listed here in alphabetical order.
    the result is always a list.
 
 
-.. function:: max(iterable[, args...][key])
+.. function:: max(iterable[, args...], *[, key])
 
    With a single argument *iterable*, return the largest item of a non-empty
    iterable (such as a string, tuple or list).  With more than one argument, return
    the largest of the arguments.
 
-   The optional *key* argument specifies a one-argument ordering function like that
-   used for :meth:`list.sort`.  The *key* argument, if supplied, must be in keyword
-   form (for example, ``max(a,b,c,key=func)``).
-
-   .. versionchanged:: 2.5
-      Added support for the optional *key* argument.
+   The optional keyword-only *key* argument specifies a one-argument ordering
+   function like that used for :meth:`list.sort`.
 
 
 .. function:: memoryview(obj)
@@ -689,18 +636,14 @@ available.  They are listed here in alphabetical order.
    XXX: To be documented.
 
 
-.. function:: min(iterable[, args...][key])
+.. function:: min(iterable[, args...], *[, key])
 
    With a single argument *iterable*, return the smallest item of a non-empty
    iterable (such as a string, tuple or list).  With more than one argument, return
    the smallest of the arguments.
 
-   The optional *key* argument specifies a one-argument ordering function like that
-   used for :meth:`list.sort`.  The *key* argument, if supplied, must be in keyword
-   form (for example, ``min(a,b,c,key=func)``).
-
-   .. versionchanged:: 2.5
-      Added support for the optional *key* argument.
+   The optional keyword-only *key* argument specifies a one-argument ordering
+   function like that used for :meth:`list.sort`.
 
 
 .. function:: next(iterator[, default])
@@ -713,19 +656,14 @@ available.  They are listed here in alphabetical order.
 .. function:: object()
 
    Return a new featureless object.  :class:`object` is a base for all classes.
-   It has the methods that are common to all instances of Python classes.
+   It has the methods that are common to all instances of Python classes.  This
+   function does not accept any arguments.
 
    .. note::
 
       :class:`object` does *not* have a :attr:`__dict__`, so you can't assign
       arbitrary attributes to an instance of the :class:`object` class.
 
-   .. versionadded:: 2.2
-
-   .. versionchanged:: 2.3
-      This function does not accept any arguments. Formerly, it accepted arguments but
-      ignored them.
-
 
 .. function:: oct(x)
 
@@ -733,9 +671,6 @@ available.  They are listed here in alphabetical order.
    expression.  If *x* is not a Python :class:`int` object, it has to define an
    :meth:`__index__` method that returns an integer.
 
-   .. versionchanged:: 2.4
-      Formerly only returned an unsigned literal.
-
 
 .. function:: open(filename[, mode[, bufsize]])
 
@@ -792,9 +727,6 @@ available.  They are listed here in alphabetical order.
 
    See also the :mod:`fileinput` module.
 
-   .. versionchanged:: 2.5
-      Restriction on first letter of mode string introduced.
-
 
 .. function:: ord(c)
 
@@ -860,11 +792,6 @@ available.  They are listed here in alphabetical order.
    turns the :meth:`voltage` method into a "getter" for a read-only attribute with
    the same name.
 
-   .. versionadded:: 2.2
-
-   .. versionchanged:: 2.5
-      Use *fget*'s docstring if no *doc* given.
-
 
 .. function:: range([start,] stop[, step])
 
@@ -909,8 +836,6 @@ available.  They are listed here in alphabetical order.
    protocol (the :meth:`__len__` method and the :meth:`__getitem__` method with
    integer arguments starting at ``0``).
 
-   .. versionadded:: 2.4
-
 
 .. function:: round(x[, n])
 
@@ -930,8 +855,6 @@ available.  They are listed here in alphabetical order.
    For other containers see the built in :class:`dict`, :class:`list`, and
    :class:`tuple` classes, and the :mod:`collections` module.
 
-   .. versionadded:: 2.4
-
 
 .. function:: setattr(object, name, value)
 
@@ -980,8 +903,6 @@ available.  They are listed here in alphabetical order.
    multiple times for each list element while *key* and *reverse* touch each
    element only once.
 
-   .. versionadded:: 2.4
-
 
 .. function:: staticmethod(function)
 
@@ -1006,11 +927,6 @@ available.  They are listed here in alphabetical order.
    For more information on static methods, consult the documentation on the
    standard type hierarchy in :ref:`types`.
 
-   .. versionadded:: 2.2
-
-   .. versionchanged:: 2.4
-      Function decorator syntax added.
-
 
 .. function:: str([object[, encoding[, errors]]])
 
@@ -1051,8 +967,6 @@ available.  They are listed here in alphabetical order.
    and are not allowed to be strings.  The fast, correct way to concatenate a
    sequence of strings is by calling ``''.join(sequence)``.
 
-   .. versionadded:: 2.3
-
 
 .. function:: super(type[, object-or-type])
 
@@ -1074,8 +988,6 @@ available.  They are listed here in alphabetical order.
    Accordingly, :func:`super` is undefined for implicit lookups using statements or
    operators such as ``super(C, self)[name]``.
 
-   .. versionadded:: 2.2
-
 
 .. function:: tuple([iterable])
 
@@ -1121,8 +1033,6 @@ available.  They are listed here in alphabetical order.
       ...     
       >>> X = type('X', (object,), dict(a=1))
 
-   .. versionadded:: 2.2
-
 
 .. function:: vars([object])
 
@@ -1143,11 +1053,6 @@ available.  They are listed here in alphabetical order.
    sequence argument, it returns a list of 1-tuples. With no arguments, it returns
    an empty list.
 
-   .. versionadded:: 2.0
-
-   .. versionchanged:: 2.4
-      Formerly, :func:`zip` required at least one argument and ``zip()`` raised a
-      :exc:`TypeError` instead of returning an empty list.
 
 .. % ---------------------------------------------------------------------------
 
diff --git a/Doc/library/functools.rst b/Doc/library/functools.rst
index 01e1fcb..a25fde9 100644
--- a/Doc/library/functools.rst
+++ b/Doc/library/functools.rst
@@ -9,8 +9,6 @@
 .. sectionauthor:: Peter Harris <scav@blueyonder.co.uk>
 
 
-.. versionadded:: 2.5
-
 The :mod:`functools` module is for higher-order functions: functions that act on
 or return other functions. In general, any callable object can be treated as a
 function for the purposes of this module.
@@ -23,8 +21,6 @@ The :mod:`functools` module defines the following functions:
    This is the same function as :func:`reduce`.  It is made available in this module
    to allow writing code more forward-compatible with Python 3.
 
-   .. versionadded:: 2.6
-
 
 .. function:: partial(func[,*args][, **keywords])
 
diff --git a/Doc/library/gc.rst b/Doc/library/gc.rst
index 70e4a6b..4a4dfde 100644
--- a/Doc/library/gc.rst
+++ b/Doc/library/gc.rst
@@ -44,9 +44,6 @@ The :mod:`gc` module provides the following functions:
    :exc:`ValueError` is raised if the generation number  is invalid. The number of
    unreachable objects found is returned.
 
-   .. versionchanged:: 2.5
-      The optional *generation* argument was added.
-
 
 .. function:: set_debug(flags)
 
@@ -65,8 +62,6 @@ The :mod:`gc` module provides the following functions:
    Returns a list of all objects tracked by the collector, excluding the list
    returned.
 
-   .. versionadded:: 2.2
-
 
 .. function:: set_threshold(threshold0[, threshold1[, threshold2]])
 
@@ -93,8 +88,6 @@ The :mod:`gc` module provides the following functions:
    Return the current collection  counts as a tuple of ``(count0, count1,
    count2)``.
 
-   .. versionadded:: 2.5
-
 
 .. function:: get_threshold()
 
@@ -119,8 +112,6 @@ The :mod:`gc` module provides the following functions:
    invalid state. Avoid using :func:`get_referrers` for any purpose other than
    debugging.
 
-   .. versionadded:: 2.2
-
 
 .. function:: get_referents(*objs)
 
@@ -132,12 +123,10 @@ The :mod:`gc` module provides the following functions:
    be involved in a cycle.  So, for example, if an integer is directly reachable
    from an argument, that integer object may or may not appear in the result list.
 
-   .. versionadded:: 2.3
 
 The following variable is provided for read-only access (you can mutate its
 value but should not rebind it):
 
-
 .. data:: garbage
 
    A list of objects which the collector found to be unreachable but could not be
diff --git a/Doc/library/getopt.rst b/Doc/library/getopt.rst
index 53a3d2b..7ead8ea 100644
--- a/Doc/library/getopt.rst
+++ b/Doc/library/getopt.rst
@@ -61,8 +61,6 @@ exception:
    variable POSIXLY_CORRECT is set, then option processing stops as soon as a
    non-option argument is encountered.
 
-   .. versionadded:: 2.3
-
 
 .. exception:: GetoptError
 
@@ -74,10 +72,7 @@ exception:
    related option; if there is no specific option to which the exception relates,
    :attr:`opt` is an empty string.
 
-   .. versionchanged:: 1.6
-      Introduced :exc:`GetoptError` as a synonym for :exc:`error`.
-
-
+.. XXX deprecated?
 .. exception:: error
 
    Alias for :exc:`GetoptError`; for backward compatibility.
diff --git a/Doc/library/getpass.rst b/Doc/library/getpass.rst
index 45c6e53..9a45b28 100644
--- a/Doc/library/getpass.rst
+++ b/Doc/library/getpass.rst
@@ -22,9 +22,6 @@ The :mod:`getpass` module provides two functions:
 
    Availability: Macintosh, Unix, Windows.
 
-   .. versionchanged:: 2.5
-      The *stream* parameter was added.
-
 
 .. function:: getuser()
 
diff --git a/Doc/library/gettext.rst b/Doc/library/gettext.rst
index 51628e6..af82f96 100644
--- a/Doc/library/gettext.rst
+++ b/Doc/library/gettext.rst
@@ -49,8 +49,6 @@ class-based API instead.
    :func:`gettext` family of functions. If *codeset* is omitted, then the current
    binding is returned.
 
-   .. versionadded:: 2.4
-
 
 .. function:: textdomain([domain])
 
@@ -72,8 +70,6 @@ class-based API instead.
    system encoding, if no other encoding was explicitly set with
    :func:`bind_textdomain_codeset`.
 
-   .. versionadded:: 2.4
-
 
 .. function:: dgettext(domain, message)
 
@@ -86,8 +82,6 @@ class-based API instead.
    system encoding, if no other encoding was explicitly set with
    :func:`bind_textdomain_codeset`.
 
-   .. versionadded:: 2.4
-
 
 .. function:: ngettext(singular, plural, n)
 
@@ -102,8 +96,6 @@ class-based API instead.
    syntax to be used in :file:`.po` files and the formulas for a variety of
    languages.
 
-   .. versionadded:: 2.3
-
 
 .. function:: lngettext(singular, plural, n)
 
@@ -111,15 +103,11 @@ class-based API instead.
    system encoding, if no other encoding was explicitly set with
    :func:`bind_textdomain_codeset`.
 
-   .. versionadded:: 2.4
-
 
 .. function:: dngettext(domain, singular, plural, n)
 
    Like :func:`ngettext`, but look the message up in the specified *domain*.
 
-   .. versionadded:: 2.3
-
 
 .. function:: ldngettext(domain, singular, plural, n)
 
@@ -127,7 +115,6 @@ class-based API instead.
    preferred system encoding, if no other encoding was explicitly set with
    :func:`bind_textdomain_codeset`.
 
-   .. versionadded:: 2.4
 
 Note that GNU :program:`gettext` also defines a :func:`dcgettext` method, but
 this was deemed not useful and so it is currently unimplemented.
@@ -199,9 +186,6 @@ the built-in namespace as the function :func:`_`.
    *fallback* is false (which is the default), and returns a
    :class:`NullTranslations` instance if *fallback* is true.
 
-   .. versionchanged:: 2.4
-      Added the *codeset* parameter.
-
 
 .. function:: install(domain[, localedir[, unicode [, codeset[, names]]]])
 
@@ -223,12 +207,6 @@ the built-in namespace as the function :func:`_`.
    builtin namespace, so it is easily accessible in all modules of your
    application.
 
-   .. versionchanged:: 2.4
-      Added the *codeset* parameter.
-
-   .. versionchanged:: 2.5
-      Added the *names* parameter.
-
 
 The :class:`NullTranslations` class
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -275,8 +253,6 @@ are the methods of :class:`NullTranslations`:
    If a fallback has been set, forward :meth:`lgettext` to the fallback. Otherwise,
    return the translated message.  Overridden in derived classes.
 
-   .. versionadded:: 2.4
-
 
 .. method:: NullTranslations.ugettext(message)
 
@@ -290,16 +266,12 @@ are the methods of :class:`NullTranslations`:
    If a fallback has been set, forward :meth:`ngettext` to the fallback. Otherwise,
    return the translated message.  Overridden in derived classes.
 
-   .. versionadded:: 2.3
-
 
 .. method:: NullTranslations.lngettext(singular, plural, n)
 
    If a fallback has been set, forward :meth:`ngettext` to the fallback. Otherwise,
    return the translated message.  Overridden in derived classes.
 
-   .. versionadded:: 2.4
-
 
 .. method:: NullTranslations.ungettext(singular, plural, n)
 
@@ -307,8 +279,6 @@ are the methods of :class:`NullTranslations`:
    Otherwise, return the translated message as a Unicode string. Overridden in
    derived classes.
 
-   .. versionadded:: 2.3
-
 
 .. method:: NullTranslations.info()
 
@@ -325,16 +295,12 @@ are the methods of :class:`NullTranslations`:
    Return the "protected" :attr:`_output_charset` variable, which defines the
    encoding used to return translated messages.
 
-   .. versionadded:: 2.4
-
 
 .. method:: NullTranslations.set_output_charset(charset)
 
    Change the "protected" :attr:`_output_charset` variable, which defines the
    encoding used to return translated messages.
 
-   .. versionadded:: 2.4
-
 
 .. method:: NullTranslations.install([unicode [, names]])
 
@@ -362,9 +328,6 @@ are the methods of :class:`NullTranslations`:
    This puts :func:`_` only in the module's global namespace and so only affects
    calls within this module.
 
-   .. versionchanged:: 2.5
-      Added the *names* parameter.
-
 
 The :class:`GNUTranslations` class
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -415,8 +378,6 @@ The following methods are overridden from the base class implementation:
    system encoding, if no other encoding was explicitly set with
    :meth:`set_output_charset`.
 
-   .. versionadded:: 2.4
-
 
 .. method:: GNUTranslations.ugettext(message)
 
@@ -437,8 +398,6 @@ The following methods are overridden from the base class implementation:
    request is forwarded to the fallback's :meth:`ngettext` method.  Otherwise, when
    *n* is 1 *singular* is returned, and *plural* is returned in all other cases.
 
-   .. versionadded:: 2.3
-
 
 .. method:: GNUTranslations.lngettext(singular, plural, n)
 
@@ -446,8 +405,6 @@ The following methods are overridden from the base class implementation:
    system encoding, if no other encoding was explicitly set with
    :meth:`set_output_charset`.
 
-   .. versionadded:: 2.4
-
 
 .. method:: GNUTranslations.ungettext(singular, plural, n)
 
@@ -469,8 +426,6 @@ The following methods are overridden from the base class implementation:
           'There are %(num)d files in this directory',
           n) % {'num': n}
 
-   .. versionadded:: 2.3
-
 
 Solaris message catalog support
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/Doc/library/glob.rst b/Doc/library/glob.rst
index 80bdac2..f4a7295 100644
--- a/Doc/library/glob.rst
+++ b/Doc/library/glob.rst
@@ -31,7 +31,6 @@ subshell.  (For tilde and shell variable expansion, use
    Return an iterator which yields the same values as :func:`glob` without actually
    storing them all simultaneously.
 
-   .. versionadded:: 2.5
 
 For example, consider a directory containing only the following files:
 :file:`1.gif`, :file:`2.txt`, and :file:`card.gif`.  :func:`glob` will produce
diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst
index f255554..d487900 100644
--- a/Doc/library/hashlib.rst
+++ b/Doc/library/hashlib.rst
@@ -8,8 +8,6 @@
 .. sectionauthor:: Gregory P. Smith <greg@users.sourceforge.net>
 
 
-.. versionadded:: 2.5
-
 .. index::
    single: message digest, MD5
    single: secure hash algorithm, SHA1, SHA224, SHA256, SHA384, SHA512
diff --git a/Doc/library/heapq.rst b/Doc/library/heapq.rst
index 2d38c26..af10019 100644
--- a/Doc/library/heapq.rst
+++ b/Doc/library/heapq.rst
@@ -11,8 +11,6 @@
 
 .. % Theoretical explanation:
 
-.. versionadded:: 2.3
-
 This module provides an implementation of the heap queue algorithm, also known
 as the priority queue algorithm.
 
@@ -99,8 +97,6 @@ The module also offers three general purpose functions based on heaps.
    not pull the data into memory all at once, and assumes that each of the input
    streams is already sorted (smallest to largest).
 
-   .. versionadded:: 2.6
-
 
 .. function:: nlargest(n, iterable[, key])
 
@@ -110,11 +106,6 @@ The module also offers three general purpose functions based on heaps.
    ``key=str.lower`` Equivalent to:  ``sorted(iterable, key=key,
    reverse=True)[:n]``
 
-   .. versionadded:: 2.4
-
-   .. versionchanged:: 2.5
-      Added the optional *key* argument.
-
 
 .. function:: nsmallest(n, iterable[, key])
 
@@ -123,10 +114,6 @@ The module also offers three general purpose functions based on heaps.
    used to extract a comparison key from each element in the iterable:
    ``key=str.lower`` Equivalent to:  ``sorted(iterable, key=key)[:n]``
 
-   .. versionadded:: 2.4
-
-   .. versionchanged:: 2.5
-      Added the optional *key* argument.
 
 The latter two functions perform best for smaller values of *n*.  For larger
 values, it is more efficient to use the :func:`sorted` function.  Also, when
diff --git a/Doc/library/hmac.rst b/Doc/library/hmac.rst
index 10d41f7..0abe421 100644
--- a/Doc/library/hmac.rst
+++ b/Doc/library/hmac.rst
author	Andy Cedilnik <andy.cedilnik@kitware.com>	2005-03-04 14:46:31 (GMT)
committer	Andy Cedilnik <andy.cedilnik@kitware.com>	2005-03-04 14:46:31 (GMT)
commit	7bc8413a0f4761e7c5a5fb1cccc8350f3d47f47d (patch)
tree	240361002c876c4345418844e3a18553ed102402 /Utilities
parent	a98ce34c814947bfbc5a6322f3baa19756b2e702 (diff)
download	CMake-7bc8413a0f4761e7c5a5fb1cccc8350f3d47f47d.zip CMake-7bc8413a0f4761e7c5a5fb1cccc8350f3d47f47d.tar.gz CMake-7bc8413a0f4761e7c5a5fb1cccc8350f3d47f47d.tar.bz2