Remove a few merged versionadded/changed.

diff --git a/Doc/library/csv.rst b/Doc/library/csv.rst
index 5e1bd1e1980df786de9b581f4de47947d708058f..bcda1bda16ac6618c2b81ceeb31a6053f74281be 100644 (file)
--- a/Doc/library/csv.rst
+++ b/Doc/library/csv.rst
@@ -121,13 +121,9 @@ The :mod:`csv` module defines the following functions:
 
 .. function:: get_dialect(name)
 
-   Return the dialect associated with *name*.  An :exc:`Error` is raised if *name*
-   is not a registered dialect name.
-
-   .. versionchanged:: 2.5
-      This function now returns an immutable :class:`Dialect`.  Previously an
-      instance of the requested dialect was returned.  Users could modify the
-      underlying class, changing the behavior of active readers and writers.
+   Return the dialect associated with *name*.  An :exc:`Error` is raised if
+   *name* is not a registered dialect name.  This function returns an immutable
+   :class:`Dialect`.
 
 .. function:: list_dialects()
 

diff --git a/Doc/library/decimal.rst b/Doc/library/decimal.rst
index d4065d717d77eabd65184ef5f4b326a0ed0a676f..fecfdeb86bb26f80bdec34de452f618c794fa2a2 100644 (file)
--- a/Doc/library/decimal.rst
+++ b/Doc/library/decimal.rst
@@ -337,7 +337,6 @@ also have a number of specialized methods:
    encoding of a :class:`Decimal` instance is always canonical, so
    this operation returns its argument unchanged.
 
-   .. versionadded:: 2.6
 
 .. method:: Decimal.compare(other[, context])
 
@@ -359,7 +358,6 @@ also have a number of specialized methods:
    NaN then any quiet NaN operand is treated as though it were a
    signaling NaN.
 
-   .. versionadded:: 2.6
 
 .. method:: Decimal.compare_total(other)
 
@@ -381,7 +379,6 @@ also have a number of specialized methods:
    than the second operand.  See the specification for details of the
    total order.
 
-   .. versionadded:: 2.6
 
 .. method:: Decimal.compare_total_mag(other)
 
@@ -390,7 +387,6 @@ also have a number of specialized methods:
    of each operand.  ``x.compare_total_mag(y)`` is equivalent to
    ``x.copy_abs().compare_total(y.copy_abs())``.
 
-   .. versionadded:: 2.6
 
 .. method:: Decimal.copy_abs()
 
@@ -398,7 +394,6 @@ also have a number of specialized methods:
    unaffected by the context and is quiet: no flags are changed and no
    rounding is performed.
 
-   .. versionadded:: 2.6
 
 .. method:: Decimal.copy_negate()
 
@@ -406,7 +401,6 @@ also have a number of specialized methods:
    by the context and is quiet: no flags are changed and no rounding
    is performed.
 
-   .. versionadded:: 2.6
 
 .. method:: Decimal.copy_sign(other)
 
@@ -419,7 +413,6 @@ also have a number of specialized methods:
    This operation is unaffected by the context and is quiet: no flags
    are changed and no rounding is performed.
 
-   .. versionadded:: 2.6
 
 .. method:: Decimal.exp([context])
 
@@ -432,7 +425,6 @@ also have a number of specialized methods:
    >>> Decimal(321).exp()
    Decimal("2.561702493119680037517373933E+139")
 
-   .. versionadded:: 2.6
 
 .. method:: Decimal.fma(other, third[, context])
 
@@ -442,7 +434,6 @@ also have a number of specialized methods:
    >>> Decimal(2).fma(3, 5)
    Decimal("11")
 
-   .. versionadded:: 2.6
 
 .. method:: Decimal.is_canonical()
 
@@ -451,28 +442,24 @@ also have a number of specialized methods:
    is always canonical, so this operation always returns
    :const:`True`.
 
-   .. versionadded:: 2.6
 
 .. method:: is_finite()
 
    Return :const:`True` if the argument is a finite number, and
    :const:`False` if the argument is an infinity or a NaN.
 
-   .. versionadded:: 2.6
 
 .. method:: is_infinite()
 
    Return :const:`True` if the argument is either positive or
    negative infinity and :const:`False` otherwise.
 
-   .. versionadded:: 2.6
 
 .. method:: is_nan()
 
    Return :const:`True` if the argument is a (quiet or signaling)
    NaN and :const:`False` otherwise.
 
-   .. versionadded:: 2.6
 
 .. method:: is_normal()
 
@@ -480,14 +467,12 @@ also have a number of specialized methods:
    Return :const:`False` if the argument is zero, subnormal, infinite
    or a NaN.
 
-   .. versionadded:: 2.6
 
 .. method:: is_qnan()
 
    Return :const:`True` if the argument is a quiet NaN, and
    :const:`False` otherwise.
 
-   .. versionadded:: 2.6
 
 .. method:: is_signed()
 
@@ -495,28 +480,24 @@ also have a number of specialized methods:
    :const:`False` otherwise.  Note that zeros and NaNs can both carry
    signs.
 
-   .. versionadded:: 2.6
 
 .. method:: is_snan()
 
    Return :const:`True` if the argument is a signaling NaN and
    :const:`False` otherwise.
 
-   .. versionadded:: 2.6
 
 .. method:: is_subnormal()
 
    Return :const:`True` if the argument is subnormal, and
    :const:`False` otherwise.
 
-   .. versionadded:: 2.6
 
 .. method:: is_zero()
 
    Return :const:`True` if the argument is a (positive or negative)
    zero and :const:`False` otherwise.
 
-   .. versionadded:: 2.6
 
 .. method:: Decimal.ln([context])
 
@@ -524,14 +505,12 @@ also have a number of specialized methods:
    is correctly rounded using the :const:`ROUND_HALF_EVEN` rounding
    mode.
 
-   .. versionadded:: 2.6
 
 .. method:: Decimal.log10([context])
 
    Return the base ten logarithm of the operand.  The result is
    correctly rounded using the :const:`ROUND_HALF_EVEN` rounding mode.
 
-   .. versionadded:: 2.6
 
 .. method:  Decimal.logb([context])
 
@@ -541,7 +520,6 @@ also have a number of specialized methods:
    :const:`DivisionByZero` flag is raised.  If the operand is an
    infinity then ``Decimal("Infinity")`` is returned.
 
-   .. versionadded:: 2.6
 
 .. method:: Decimal.logical_and(other[, context])
 
@@ -549,7 +527,6 @@ also have a number of specialized methods:
    *logical operands* (see :ref:`logical_operands_label`).  The result
    is the digit-wise ``and`` of the two operands.
 
-   .. versionadded:: 2.6
 
 .. method:: Decimal.logical_invert(other[, context])
 
@@ -557,7 +534,6 @@ also have a number of specialized methods:
    be a *logical operand* (see :ref:`logical_operands_label`).  The
    result is the digit-wise inversion of the operand.
 
-   .. versionadded:: 2.6
 
 .. method:: Decimal.logical_or(other[, context])
 
@@ -565,7 +541,6 @@ also have a number of specialized methods:
    operands* (see :ref:`logical_operands_label`).  The result is the
    digit-wise ``or`` of the two operands.
 
-   .. versionadded:: 2.6
 
 .. method:: Decimal.logical_xor(other[, context])
 
@@ -573,7 +548,6 @@ also have a number of specialized methods:
    *logical operands* (see :ref:`logical_operands_label`).  The result
    is the digit-wise exclusive or of the two operands.
 
-   .. versionadded:: 2.6
 
 .. method:: Decimal.max(other[, context])
 
@@ -581,12 +555,12 @@ also have a number of specialized methods:
    before returning and that :const:`NaN` values are either signaled or ignored
    (depending on the context and whether they are signaling or quiet).
 
+
 .. method:: Decimal.max_mag(other[, context])
 
    Similar to the :meth:`max` method, but the comparison is done using
    the absolute values of the operands.
 
-   .. versionadded:: 2.6
 
 .. method:: Decimal.min(other[, context])
 
@@ -599,7 +573,6 @@ also have a number of specialized methods:
    Similar to the :meth:`min` method, but the comparison is done using
    the absolute values of the operands.
 
-   .. versionadded:: 2.6
 
 .. method:: Decimal.next_minus([context])
 
@@ -607,7 +580,6 @@ also have a number of specialized methods:
    in the current thread's context if no context is given) that is smaller
    than the given operand.
 
-   .. versionadded:: 2.6
 
 .. method:: Decimal.next_plus([context])
 
@@ -615,7 +587,6 @@ also have a number of specialized methods:
    in the current thread's context if no context is given) that is
    larger than the given operand.
 
-   .. versionadded:: 2.6
 
 .. method:: Decimal.next_toward(other[, context])
 
@@ -624,7 +595,6 @@ also have a number of specialized methods:
    operands are numerically equal, return a copy of the first operand
    with the sign set to be the same as the sign of the second operand.
 
-   .. versionadded:: 2.6
 
 .. method:: Decimal.normalize([context])
 
@@ -634,6 +604,7 @@ also have a number of specialized methods:
    ``Decimal("32.100")`` and ``Decimal("0.321000e+2")`` both normalize to the
    equivalent value ``Decimal("32.1")``.
 
+
 .. method:: Decimal.number_class([context])
 
    Return a string describing the *class* of the operand.  The
@@ -650,7 +621,6 @@ also have a number of specialized methods:
    * ``"NaN"``, indicating that the operand is a quiet NaN (Not a Number).
    * ``"sNaN"``, indicating that the operand is a signaling NaN.
 
-   .. versionadded:: 2.6
 
 .. method:: Decimal.quantize(exp[, rounding[, context[, watchexp]]])
 
@@ -684,7 +654,6 @@ also have a number of specialized methods:
    :class:`Decimal` class does all its arithmetic.  Included for
    compatibility with the specification.
 
-   .. versionadded:: 2.6
 
 .. method:: Decimal.remainder_near(other[, context])
 
@@ -706,7 +675,6 @@ also have a number of specialized methods:
    if necessary.  The sign and exponent of the first operand are
    unchanged.
 
-   .. versionadded:: 2.6
 
 .. method:: Decimal.same_quantum(other[, context])
 
@@ -719,7 +687,6 @@ also have a number of specialized methods:
    Equivalently, return the first operand multiplied by ``10**other``.
    The second operand must be an integer.
 
-   .. versionadded:: 2.6
 
 .. method:: Decimal.shift(other[, context])
 
@@ -732,7 +699,6 @@ also have a number of specialized methods:
    coefficient are zeros.  The sign and exponent of the first operand
    are unchanged.
 
-   .. versionadded:: 2.6
 
 .. method:: Decimal.sqrt([context])
 
@@ -761,7 +727,6 @@ also have a number of specialized methods:
    parameter is given then the rounding mode of the current context is
    used.
 
-   .. versionadded:: 2.6
 
 .. method:: Decimal.to_integral_value([rounding[, context]])
 
@@ -769,9 +734,6 @@ also have a number of specialized methods:
    :const:`Rounded`.  If given, applies *rounding*; otherwise, uses the rounding
    method in either the supplied *context* or the current context.
 
-   .. versionchanged:: 2.6
-      renamed from ``to_integral`` to ``to_integral_value``.  The old name
-      remains valid for compatibility.
 
 .. method:: Decimal.trim()
 
@@ -781,7 +743,6 @@ also have a number of specialized methods:
    is, the last element of the :meth:`as_tuple` representation) is
    positive.
 
-   .. versionadded:: 2.6
 
 .. _logical_operands_label:
 
@@ -921,8 +882,6 @@ In addition to the three supplied contexts, new contexts can be created with the
    :const:`1`, exponents are printed with a capital :const:`E`; otherwise, a
    lowercase :const:`e` is used: :const:`Decimal('6.02e+23')`.
 
-   .. versionchanged:: 2.6
-      The :const:`ROUND_05UP` rounding mode was added.
 
 The :class:`Context` class defines several general purpose methods as
 well as a large number of methods for doing arithmetic directly in a
@@ -1048,10 +1007,6 @@ those for the :class:`Decimal` class and are only briefly recounted here.
    modulo`` with unbounded precision, but is computed more
    efficiently.  It is always exact.
 
-   .. versionchanged:: 2.6 
-      ``y`` may now be nonintegral in ``x**y``.
-      Stricter requirements for the three-argument version.
-
 
 .. method:: Context.remainder(x, y)
 

diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst
index 5620b1b31aa9bfb9b097df508bc77039a2c31764..d29ce12d6306b7c49bb6101e6dd85592ca4cf79f 100644 (file)
--- a/Doc/library/exceptions.rst
+++ b/Doc/library/exceptions.rst
@@ -147,9 +147,6 @@ The following exceptions are the exceptions that are actually raised.
    This class is derived from :exc:`EnvironmentError`.  See the discussion above
    for more information on exception instance attributes.
 
-   .. versionchanged:: 2.6
-      Changed :exc:`socket.error` to use this as a base class.
-
 
 .. exception:: ImportError
 

diff --git a/Doc/library/readline.rst b/Doc/library/readline.rst
index 7e6eccf8db34827f260155bd5caef173a91345e7..942650478b792aa1a241598334abc504b78bbbe6 100644 (file)
--- a/Doc/library/readline.rst
+++ b/Doc/library/readline.rst
@@ -132,7 +132,6 @@ The :mod:`readline` module defines the following functions:
 
    Get the type of completion being attempted.
 
-   .. versionadded:: 2.6
 
 .. function:: get_begidx()
 
@@ -153,6 +152,7 @@ The :mod:`readline` module defines the following functions:
 
    Get the readline word delimiters for tab-completion.
 
+
 .. function:: set_completion_display_matches_hook([function])
 
    Set or remove the completion display function.  If *function* is
@@ -162,7 +162,6 @@ The :mod:`readline` module defines the following functions:
    ``function(substitution, [matches], longest_match_length)`` once
    each time matches need to be displayed.
 
-   .. versionadded:: 2.6
 
 .. function:: add_history(line)
 

diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 19970ad46b564c93586f7fd1c3b4b74691435d2d..5c3d9f67ea4e277ec5a79f3a0bdf5e50ce93582f 100644 (file)
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -85,9 +85,6 @@ The module :mod:`socket` exports the following constants and functions:
    accompanying :exc:`os.error`. See the module :mod:`errno`, which contains names
    for the error codes defined by the underlying operating system.
 
-   .. versionchanged:: 2.6
-      :exc:`socket.error` is now a child class of :exc:`IOError`.
-
 
 .. exception:: herror
 

diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index 56d485160fa475881bdfb1db2cc13b30b2029cdf..6822e7eaaab1afa190f581494e15f188b32fef8d 100644 (file)
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1438,8 +1438,6 @@ operations:
    Return True if the set has no elements in common with *other*.
    Sets are disjoint if and only if their interesection is the empty set.
 
-   .. versionadded:: 2.6
-
 .. method:: set.issubset(other)
             set <= other