After discussing some more with Georg, do no migrate versionchanged:: 2.5 to

this branch. While I am here, also get rid of other versionchanged:: 2.x
constructs, as discussed.

19 files changed, 3 insertions, 360 deletions

diff --git a/Doc/c-api/allocation.rst b/Doc/c-api/allocation.rst
index 32397b3..b64381b 100644
--- a/Doc/c-api/allocation.rst
+++ b/Doc/c-api/allocation.rst
@@ -11,10 +11,6 @@ Allocating Objects on the Heap
 
 .. cfunction:: PyVarObject* _PyObject_NewVar(PyTypeObject *type, Py_ssize_t size)
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *size*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PyObject_Init(PyObject *op, PyTypeObject *type)
 
@@ -30,10 +26,6 @@ Allocating Objects on the Heap
    This does everything :cfunc:`PyObject_Init` does, and also initializes the
    length information for a variable-size object.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *size*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: TYPE* PyObject_New(TYPE, PyTypeObject *type)
 
@@ -55,10 +47,6 @@ Allocating Objects on the Heap
    fields into the same allocation decreases the number of allocations,
    improving the memory management efficiency.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *size*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: void PyObject_Del(PyObject *op)
 
diff --git a/Doc/c-api/arg.rst b/Doc/c-api/arg.rst
index 600fcac..dcf7547 100644
--- a/Doc/c-api/arg.rst
+++ b/Doc/c-api/arg.rst
@@ -406,10 +406,6 @@ and the following format units are left untouched.
 
       PyArg_ParseTuple(args, "O|O:ref", &object, &callback)
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *min* and *max*. This might
-      require changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* Py_BuildValue(const char *format, ...)
 
diff --git a/Doc/c-api/dict.rst b/Doc/c-api/dict.rst
index dad5cf0..89db16e 100644
--- a/Doc/c-api/dict.rst
+++ b/Doc/c-api/dict.rst
@@ -140,10 +140,6 @@ Dictionary Objects
    Return the number of items in the dictionary.  This is equivalent to
    ``len(p)`` on a dictionary.
 
-   .. versionchanged:: 2.5
-      This function returned an :ctype:`int` type.  This might require changes
-      in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: int PyDict_Next(PyObject *p, Py_ssize_t *ppos, PyObject **pkey, PyObject **pvalue)
 
@@ -190,10 +186,6 @@ Dictionary Objects
           Py_DECREF(o);
       }
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int *` type for *ppos*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: int PyDict_Merge(PyObject *a, PyObject *b, int override)
 
diff --git a/Doc/c-api/gcsupport.rst b/Doc/c-api/gcsupport.rst
index b7be993..4f4d27d 100644
--- a/Doc/c-api/gcsupport.rst
+++ b/Doc/c-api/gcsupport.rst
@@ -45,20 +45,12 @@ Constructors for container types must conform to two rules:
    Analogous to :cfunc:`PyObject_NewVar` but for container objects with the
    :const:`Py_TPFLAGS_HAVE_GC` flag set.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *size*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: TYPE* PyObject_GC_Resize(TYPE, PyVarObject *op, Py_ssize_t newsize)
 
    Resize an object allocated by :cfunc:`PyObject_NewVar`.  Returns the
    resized object or *NULL* on failure.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *newsize*. This might
-      require changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: void PyObject_GC_Track(PyObject *op)
 
diff --git a/Doc/c-api/list.rst b/Doc/c-api/list.rst
index e971d36..7b8cd5c 100644
--- a/Doc/c-api/list.rst
+++ b/Doc/c-api/list.rst
@@ -45,10 +45,6 @@ List Objects
       :cfunc:`PySequence_SetItem`  or expose the object to Python code before
       setting all items to a real object with :cfunc:`PyList_SetItem`.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` for *size*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: Py_ssize_t PyList_Size(PyObject *list)
 
@@ -57,19 +53,11 @@ List Objects
    Return the length of the list object in *list*; this is equivalent to
    ``len(list)`` on a list object.
 
-   .. versionchanged:: 2.5
-      This function returned an :ctype:`int`. This might require changes in
-      your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: Py_ssize_t PyList_GET_SIZE(PyObject *list)
 
    Macro form of :cfunc:`PyList_Size` without error checking.
 
-   .. versionchanged:: 2.5
-      This macro returned an :ctype:`int`. This might require changes in your
-      code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PyList_GetItem(PyObject *list, Py_ssize_t index)
 
@@ -78,19 +66,11 @@ List Objects
    supported.  If *pos* is out of bounds, return *NULL* and set an
    :exc:`IndexError` exception.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` for *index*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PyList_GET_ITEM(PyObject *list, Py_ssize_t i)
 
    Macro form of :cfunc:`PyList_GetItem` without error checking.
 
-   .. versionchanged:: 2.5
-      This macro used an :ctype:`int` for *i*. This might require changes in
-      your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: int PyList_SetItem(PyObject *list, Py_ssize_t index, PyObject *item)
 
@@ -102,10 +82,6 @@ List Objects
       This function "steals" a reference to *item* and discards a reference to
       an item already in the list at the affected position.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` for *index*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: void PyList_SET_ITEM(PyObject *list, Py_ssize_t i, PyObject *o)
 
@@ -119,10 +95,6 @@ List Objects
       is being replaced; any reference in *list* at position *i* will be
       leaked.
 
-   .. versionchanged:: 2.5
-      This macro used an :ctype:`int` for *i*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: int PyList_Insert(PyObject *list, Py_ssize_t index, PyObject *item)
 
@@ -130,10 +102,6 @@ List Objects
    ``0`` if successful; return ``-1`` and set an exception if unsuccessful.
    Analogous to ``list.insert(index, item)``.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` for *index*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: int PyList_Append(PyObject *list, PyObject *item)
 
@@ -148,10 +116,6 @@ List Objects
    *low* and *high*.  Return *NULL* and set an exception if unsuccessful.
    Analogous to ``list[low:high]``.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` for *low* and *high*. This might
-      require changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: int PyList_SetSlice(PyObject *list, Py_ssize_t low, Py_ssize_t high, PyObject *itemlist)
 
@@ -160,10 +124,6 @@ List Objects
    be *NULL*, indicating the assignment of an empty list (slice deletion).
    Return ``0`` on success, ``-1`` on failure.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` for *low* and *high*. This might
-      require changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: int PyList_Sort(PyObject *list)
 
diff --git a/Doc/c-api/long.rst b/Doc/c-api/long.rst
index 2a25705..19d65b8 100644
--- a/Doc/c-api/long.rst
+++ b/Doc/c-api/long.rst
@@ -100,10 +100,6 @@ All integers are implemented as "long" integer objects of arbitrary size.
    string is first encoded to a byte string using :cfunc:`PyUnicode_EncodeDecimal`
    and then converted using :cfunc:`PyLong_FromString`.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` for *length*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PyLong_FromVoidPtr(void *p)
 
diff --git a/Doc/c-api/mapping.rst b/Doc/c-api/mapping.rst
index c2c22e5..1d0ed50 100644
--- a/Doc/c-api/mapping.rst
+++ b/Doc/c-api/mapping.rst
@@ -21,10 +21,6 @@ Mapping Protocol
    objects that do not provide mapping protocol, this is equivalent to the Python
    expression ``len(o)``.
 
-   .. versionchanged:: 2.5
-      These functions returned an :ctype:`int` type. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: int PyMapping_DelItemString(PyObject *o, char *key)
 
diff --git a/Doc/c-api/marshal.rst b/Doc/c-api/marshal.rst
index 16c9fc3..04b0b88 100644
--- a/Doc/c-api/marshal.rst
+++ b/Doc/c-api/marshal.rst
@@ -87,6 +87,3 @@ written using these routines?
    appropriate exception (:exc:`EOFError` or :exc:`TypeError`) and returns
    *NULL*.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *len*. This might require
-      changes in your code for properly supporting 64-bit systems.
diff --git a/Doc/c-api/objbuffer.rst b/Doc/c-api/objbuffer.rst
index e816c3d..0973aad 100644
--- a/Doc/c-api/objbuffer.rst
+++ b/Doc/c-api/objbuffer.rst
@@ -14,10 +14,6 @@ Buffer Protocol
    and *buffer_len* to the buffer length.  Returns ``-1`` and sets a
    :exc:`TypeError` on error.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int *` type for *buffer_len*. This might
-      require changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: int PyObject_AsReadBuffer(PyObject *obj, const void **buffer, Py_ssize_t *buffer_len)
 
@@ -27,10 +23,6 @@ Buffer Protocol
    and *buffer_len* to the buffer length.  Returns ``-1`` and sets a
    :exc:`TypeError` on error.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int *` type for *buffer_len*. This might
-      require changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: int PyObject_CheckReadBuffer(PyObject *o)
 
@@ -45,7 +37,3 @@ Buffer Protocol
    returns ``0``, sets *buffer* to the memory location and *buffer_len* to the
    buffer length.  Returns ``-1`` and sets a :exc:`TypeError` on error.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int *` type for *buffer_len*. This might
-      require changes in your code for properly supporting 64-bit systems.
-
diff --git a/Doc/c-api/object.rst b/Doc/c-api/object.rst
index 108b1be..b0700a1 100644
--- a/Doc/c-api/object.rst
+++ b/Doc/c-api/object.rst
@@ -304,10 +304,6 @@ is considered sufficient for this determination.
    and mapping protocols, the sequence length is returned.  On error, ``-1`` is
    returned.  This is the equivalent to the Python expression ``len(o)``.
 
-   .. versionchanged:: 2.5
-      These functions returned an :ctype:`int` type. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PyObject_GetItem(PyObject *o, PyObject *key)
 
diff --git a/Doc/c-api/sequence.rst b/Doc/c-api/sequence.rst
index b3e76b7..6be9810 100644
--- a/Doc/c-api/sequence.rst
+++ b/Doc/c-api/sequence.rst
@@ -21,10 +21,6 @@ Sequence Protocol
    For objects that do not provide sequence protocol, this is equivalent to the
    Python expression ``len(o)``.
 
-   .. versionchanged:: 2.5
-      These functions returned an :ctype:`int` type. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PySequence_Concat(PyObject *o1, PyObject *o2)
 
@@ -37,10 +33,6 @@ Sequence Protocol
    Return the result of repeating sequence object *o* *count* times, or *NULL* on
    failure.  This is the equivalent of the Python expression ``o * count``.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *count*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PySequence_InPlaceConcat(PyObject *o1, PyObject *o2)
 
@@ -55,30 +47,18 @@ Sequence Protocol
    failure.  The operation is done *in-place* when *o* supports it.  This is the
    equivalent of the Python expression ``o *= count``.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *count*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PySequence_GetItem(PyObject *o, Py_ssize_t i)
 
    Return the *i*th element of *o*, or *NULL* on failure. This is the equivalent of
    the Python expression ``o[i]``.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *i*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PySequence_GetSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2)
 
    Return the slice of sequence object *o* between *i1* and *i2*, or *NULL* on
    failure. This is the equivalent of the Python expression ``o[i1:i2]``.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *i1* and *i2*. This might
-      require changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: int PySequence_SetItem(PyObject *o, Py_ssize_t i, PyObject *v)
 
@@ -86,40 +66,24 @@ Sequence Protocol
    is the equivalent of the Python statement ``o[i] = v``.  This function *does
    not* steal a reference to *v*.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *i*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: int PySequence_DelItem(PyObject *o, Py_ssize_t i)
 
    Delete the *i*th element of object *o*.  Returns ``-1`` on failure.  This is the
    equivalent of the Python statement ``del o[i]``.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *i*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: int PySequence_SetSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2, PyObject *v)
 
    Assign the sequence object *v* to the slice in sequence object *o* from *i1* to
    *i2*.  This is the equivalent of the Python statement ``o[i1:i2] = v``.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *i1* and *i2*. This might
-      require changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: int PySequence_DelSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2)
 
    Delete the slice in sequence object *o* from *i1* to *i2*.  Returns ``-1`` on
    failure.  This is the equivalent of the Python statement ``del o[i1:i2]``.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *i1* and *i2*. This might
-      require changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: Py_ssize_t PySequence_Count(PyObject *o, PyObject *value)
 
@@ -127,10 +91,6 @@ Sequence Protocol
    of keys for which ``o[key] == value``.  On failure, return ``-1``.  This is
    equivalent to the Python expression ``o.count(value)``.
 
-   .. versionchanged:: 2.5
-      This function returned an :ctype:`int` type. This might require changes
-      in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: int PySequence_Contains(PyObject *o, PyObject *value)
 
@@ -144,10 +104,6 @@ Sequence Protocol
    Return the first index *i* for which ``o[i] == value``.  On error, return
    ``-1``.    This is equivalent to the Python expression ``o.index(value)``.
 
-   .. versionchanged:: 2.5
-      This function returned an :ctype:`int` type. This might require changes
-      in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PySequence_List(PyObject *o)
 
@@ -178,10 +134,6 @@ Sequence Protocol
    Return the *i*th element of *o*, assuming that *o* was returned by
    :cfunc:`PySequence_Fast`, *o* is not *NULL*, and that *i* is within bounds.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *i*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject** PySequence_Fast_ITEMS(PyObject *o)
 
@@ -200,10 +152,6 @@ Sequence Protocol
    :cfunc:`PySequence_Check(o)` is true and without adjustment for negative
    indices.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *i*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: Py_ssize_t PySequence_Fast_GET_SIZE(PyObject *o)
 
diff --git a/Doc/c-api/set.rst b/Doc/c-api/set.rst
index 7663096..4348108 100644
--- a/Doc/c-api/set.rst
+++ b/Doc/c-api/set.rst
@@ -106,10 +106,6 @@ or :class:`frozenset` or instances of their subtypes.
    ``len(anyset)``.  Raises a :exc:`PyExc_SystemError` if *anyset* is not a
    :class:`set`, :class:`frozenset`, or an instance of a subtype.
 
-   .. versionchanged:: 2.5
-      This function returned an :ctype:`int`. This might require changes in
-      your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: Py_ssize_t PySet_GET_SIZE(PyObject *anyset)
 
diff --git a/Doc/c-api/slice.rst b/Doc/c-api/slice.rst
index 68c0e93..f8f2a44 100644
--- a/Doc/c-api/slice.rst
+++ b/Doc/c-api/slice.rst
@@ -40,11 +40,6 @@ Slice Objects
 
    You probably do not want to use this function.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *length* and an
-      :ctype:`int *` type for *start*, *stop*, and *step*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: int PySlice_GetIndicesEx(PySliceObject *slice, Py_ssize_t length, Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step, Py_ssize_t *slicelength)
 
@@ -56,8 +51,3 @@ Slice Objects
 
    Returns 0 on success and -1 on error with exception set.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *length* and an
-      :ctype:`int *` type for *start*, *stop*, *step*, and *slicelength*. This
-      might require changes in your code for properly supporting 64-bit
-      systems.
diff --git a/Doc/c-api/tuple.rst b/Doc/c-api/tuple.rst
index 5cfab9c..a66f043 100644
--- a/Doc/c-api/tuple.rst
+++ b/Doc/c-api/tuple.rst
@@ -37,10 +37,6 @@ Tuple Objects
 
    Return a new tuple object of size *len*, or *NULL* on failure.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *len*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PyTuple_Pack(Py_ssize_t n, ...)
 
@@ -48,58 +44,34 @@ Tuple Objects
    are initialized to the subsequent *n* C arguments pointing to Python objects.
    ``PyTuple_Pack(2, a, b)`` is equivalent to ``Py_BuildValue("(OO)", a, b)``.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *n*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: Py_ssize_t PyTuple_Size(PyObject *p)
 
    Take a pointer to a tuple object, and return the size of that tuple.
 
-   .. versionchanged:: 2.5
-      This function returned an :ctype:`int` type. This might require changes
-      in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: Py_ssize_t PyTuple_GET_SIZE(PyObject *p)
 
    Return the size of the tuple *p*, which must be non-*NULL* and point to a tuple;
    no error checking is performed.
 
-   .. versionchanged:: 2.5
-      This function returned an :ctype:`int` type. This might require changes
-      in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PyTuple_GetItem(PyObject *p, Py_ssize_t pos)
 
    Return the object at position *pos* in the tuple pointed to by *p*.  If *pos* is
    out of bounds, return *NULL* and sets an :exc:`IndexError` exception.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *pos*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PyTuple_GET_ITEM(PyObject *p, Py_ssize_t pos)
 
    Like :cfunc:`PyTuple_GetItem`, but does no checking of its arguments.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *pos*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PyTuple_GetSlice(PyObject *p, Py_ssize_t low, Py_ssize_t high)
 
    Take a slice of the tuple pointed to by *p* from *low* to *high* and return it
    as a new tuple.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *low* and *high*. This might
-      require changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: int PyTuple_SetItem(PyObject *p, Py_ssize_t pos, PyObject *o)
 
@@ -110,10 +82,6 @@ Tuple Objects
 
       This function "steals" a reference to *o*.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *pos*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: void PyTuple_SET_ITEM(PyObject *p, Py_ssize_t pos, PyObject *o)
 
@@ -124,10 +92,6 @@ Tuple Objects
 
       This function "steals" a reference to *o*.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *pos*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: int _PyTuple_Resize(PyObject **p, Py_ssize_t newsize)
 
@@ -142,10 +106,6 @@ Tuple Objects
    ``*p`` is destroyed.  On failure, returns ``-1`` and sets ``*p`` to *NULL*, and
    raises :exc:`MemoryError` or :exc:`SystemError`.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *newsize*. This might
-      require changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: int PyTuple_ClearFreeList(void)
 
diff --git a/Doc/c-api/type.rst b/Doc/c-api/type.rst
index 447efb0..07f82c9 100644
--- a/Doc/c-api/type.rst
+++ b/Doc/c-api/type.rst
@@ -66,10 +66,6 @@ Type Objects
 
    XXX: Document.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *nitems*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PyType_GenericNew(PyTypeObject *type, PyObject *args, PyObject *kwds)
 
diff --git a/Doc/c-api/typeobj.rst b/Doc/c-api/typeobj.rst
index 81ef922..eba8d69 100644
--- a/Doc/c-api/typeobj.rst
+++ b/Doc/c-api/typeobj.rst
@@ -64,10 +64,6 @@ type objects) *must* have the :attr:`ob_size` field.
 
    This field is not inherited by subtypes.
 
-   .. versionchanged:: 2.5
-      This field used to be an :ctype:`int` type. This might require changes
-      in your code for properly supporting 64-bit systems.
-
 
 .. cmember:: PyTypeObject* PyObject.ob_type
 
diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst
index 5526e99..d6cedac 100644
--- a/Doc/c-api/unicode.rst
+++ b/Doc/c-api/unicode.rst
@@ -65,20 +65,12 @@ access internal read-only data of Unicode objects:
    Return the size of the object.  *o* has to be a :ctype:`PyUnicodeObject` (not
    checked).
 
-   .. versionchanged:: 2.5
-      This function returned an :ctype:`int` type. This might require changes
-      in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: Py_ssize_t PyUnicode_GET_DATA_SIZE(PyObject *o)
 
    Return the size of the object's internal buffer in bytes.  *o* has to be a
    :ctype:`PyUnicodeObject` (not checked).
 
-   .. versionchanged:: 2.5
-      This function returned an :ctype:`int` type. This might require changes
-      in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: Py_UNICODE* PyUnicode_AS_UNICODE(PyObject *o)
 
@@ -214,9 +206,6 @@ APIs:
    Therefore, modification of the resulting Unicode object is only allowed when *u*
    is *NULL*.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *size*. This might require
-      changes in your code for properly supporting 64-bit systems.
 
 .. cfunction:: PyObject* PyUnicode_FromStringAndSize(const char *u, Py_ssize_t size)
 
@@ -328,10 +317,6 @@ APIs:
 
    Return the length of the Unicode object.
 
-   .. versionchanged:: 2.5
-      This function returned an :ctype:`int` type. This might require changes
-      in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PyUnicode_FromEncodedObject(PyObject *obj, const char *encoding, const char *errors)
 
@@ -370,10 +355,6 @@ the system's :ctype:`wchar_t`.
    using wcslen.
    Return *NULL* on failure.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *size*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: Py_ssize_t PyUnicode_AsWideChar(PyUnicodeObject *unicode, wchar_t *w, Py_ssize_t size)
 
@@ -385,11 +366,6 @@ the system's :ctype:`wchar_t`.
    to make sure that the :ctype:`wchar_t` string is 0-terminated in case this is
    required by the application.
 
-   .. versionchanged:: 2.5
-      This function returned an :ctype:`int` type and used an :ctype:`int`
-      type for *size*. This might require changes in your code for properly
-      supporting 64-bit systems.
-
 
 .. _builtincodecs:
 
@@ -429,10 +405,6 @@ These are the generic codec APIs:
    using the Python codec registry.  Return *NULL* if an exception was raised by
    the codec.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *size*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PyUnicode_Encode(const Py_UNICODE *s, Py_ssize_t size, const char *encoding, const char *errors)
 
@@ -442,10 +414,6 @@ These are the generic codec APIs:
    to be used is looked up using the Python codec registry.  Return *NULL* if an
    exception was raised by the codec.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *size*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PyUnicode_AsEncodedString(PyObject *unicode, const char *encoding, const char *errors)
 
@@ -465,10 +433,6 @@ These are the UTF-8 codec APIs:
    Create a Unicode object by decoding *size* bytes of the UTF-8 encoded string
    *s*. Return *NULL* if an exception was raised by the codec.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *size*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PyUnicode_DecodeUTF8Stateful(const char *s, Py_ssize_t size, const char *errors, Py_ssize_t *consumed)
 
@@ -477,10 +441,6 @@ These are the UTF-8 codec APIs:
    treated as an error. Those bytes will not be decoded and the number of bytes
    that have been decoded will be stored in *consumed*.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *size*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PyUnicode_EncodeUTF8(const Py_UNICODE *s, Py_ssize_t size, const char *errors)
 
@@ -488,10 +448,6 @@ These are the UTF-8 codec APIs:
    return a Python bytes object.  Return *NULL* if an exception was raised by
    the codec.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *size*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PyUnicode_AsUTF8String(PyObject *unicode)
 
@@ -591,10 +547,6 @@ These are the UTF-16 codec APIs:
 
    Return *NULL* if an exception was raised by the codec.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *size*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PyUnicode_DecodeUTF16Stateful(const char *s, Py_ssize_t size, const char *errors, int *byteorder, Py_ssize_t *consumed)
 
@@ -604,11 +556,6 @@ These are the UTF-16 codec APIs:
    split surrogate pair) as an error. Those bytes will not be decoded and the
    number of bytes that have been decoded will be stored in *consumed*.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *size* and an :ctype:`int *`
-      type for *consumed*. This might require changes in your code for
-      properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PyUnicode_EncodeUTF16(const Py_UNICODE *s, Py_ssize_t size, const char *errors, int byteorder)
 
@@ -629,10 +576,6 @@ These are the UTF-16 codec APIs:
 
    Return *NULL* if an exception was raised by the codec.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *size*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PyUnicode_AsUTF16String(PyObject *unicode)
 
@@ -650,10 +593,6 @@ These are the "Unicode Escape" codec APIs:
    Create a Unicode object by decoding *size* bytes of the Unicode-Escape encoded
    string *s*.  Return *NULL* if an exception was raised by the codec.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *size*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PyUnicode_EncodeUnicodeEscape(const Py_UNICODE *s, Py_ssize_t size)
 
@@ -661,10 +600,6 @@ These are the "Unicode Escape" codec APIs:
    return a Python string object.  Return *NULL* if an exception was raised by the
    codec.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *size*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PyUnicode_AsUnicodeEscapeString(PyObject *unicode)
 
@@ -682,10 +617,6 @@ These are the "Raw Unicode Escape" codec APIs:
    Create a Unicode object by decoding *size* bytes of the Raw-Unicode-Escape
    encoded string *s*.  Return *NULL* if an exception was raised by the codec.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *size*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PyUnicode_EncodeRawUnicodeEscape(const Py_UNICODE *s, Py_ssize_t size, const char *errors)
 
@@ -693,10 +624,6 @@ These are the "Raw Unicode Escape" codec APIs:
    and return a Python string object.  Return *NULL* if an exception was raised by
    the codec.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *size*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PyUnicode_AsRawUnicodeEscapeString(PyObject *unicode)
 
@@ -715,10 +642,6 @@ ordinals and only these are accepted by the codecs during encoding.
    Create a Unicode object by decoding *size* bytes of the Latin-1 encoded string
    *s*.  Return *NULL* if an exception was raised by the codec.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *size*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PyUnicode_EncodeLatin1(const Py_UNICODE *s, Py_ssize_t size, const char *errors)
 
@@ -726,10 +649,6 @@ ordinals and only these are accepted by the codecs during encoding.
    return a Python bytes object.  Return *NULL* if an exception was raised by
    the codec.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *size*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PyUnicode_AsLatin1String(PyObject *unicode)
 
@@ -748,10 +667,6 @@ codes generate errors.
    Create a Unicode object by decoding *size* bytes of the ASCII encoded string
    *s*.  Return *NULL* if an exception was raised by the codec.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *size*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PyUnicode_EncodeASCII(const Py_UNICODE *s, Py_ssize_t size, const char *errors)
 
@@ -759,10 +674,6 @@ codes generate errors.
    return a Python bytes object.  Return *NULL* if an exception was raised by
    the codec.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *size*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PyUnicode_AsASCIIString(PyObject *unicode)
 
@@ -805,10 +716,6 @@ characters to different code points.
    Byte values greater that the length of the string and U+FFFE "characters" are
    treated as "undefined mapping".
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *size*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PyUnicode_EncodeCharmap(const Py_UNICODE *s, Py_ssize_t size, PyObject *mapping, const char *errors)
 
@@ -816,10 +723,6 @@ characters to different code points.
    *mapping* object and return a Python string object. Return *NULL* if an
    exception was raised by the codec.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *size*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PyUnicode_AsCharmapString(PyObject *unicode, PyObject *mapping)
 
@@ -843,9 +746,6 @@ The following codec API is special in that maps Unicode to Unicode.
    and sequences work well.  Unmapped character ordinals (ones which cause a
    :exc:`LookupError`) are left untouched and are copied as-is.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *size*. This might require
-      changes in your code for properly supporting 64-bit systems.
 
 These are the MBCS codec APIs. They are currently only available on Windows and
 use the Win32 MBCS converters to implement the conversions.  Note that MBCS (or
@@ -860,10 +760,6 @@ the user settings on the machine running the codec.
    Create a Unicode object by decoding *size* bytes of the MBCS encoded string *s*.
    Return *NULL* if an exception was raised by the codec.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *size*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PyUnicode_DecodeMBCSStateful(const char *s, int size, const char *errors, int *consumed)
 
@@ -879,10 +775,6 @@ the user settings on the machine running the codec.
    a Python bytes object.  Return *NULL* if an exception was raised by the
    codec.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *size*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PyUnicode_AsMBCSString(PyObject *unicode)
 
@@ -917,10 +809,6 @@ They all return *NULL* or ``-1`` if an exception occurs.
    separator.  At most *maxsplit* splits will be done.  If negative, no limit is
    set.  Separators are not included in the resulting list.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *maxsplit*. This might require
-      changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PyUnicode_Splitlines(PyObject *s, int keepend)
 
@@ -957,11 +845,6 @@ They all return *NULL* or ``-1`` if an exception occurs.
    (*direction* == -1 means to do a prefix match, *direction* == 1 a suffix match),
    0 otherwise. Return ``-1`` if an error occurred.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *start* and *end*. This
-      might require changes in your code for properly supporting 64-bit
-      systems.
-
 
 .. cfunction:: Py_ssize_t PyUnicode_Find(PyObject *str, PyObject *substr, Py_ssize_t start, Py_ssize_t end, int direction)
 
@@ -971,22 +854,12 @@ They all return *NULL* or ``-1`` if an exception occurs.
    ``-1`` indicates that no match was found, and ``-2`` indicates that an error
    occurred and an exception has been set.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *start* and *end*. This
-      might require changes in your code for properly supporting 64-bit
-      systems.
-
 
 .. cfunction:: Py_ssize_t PyUnicode_Count(PyObject *str, PyObject *substr, Py_ssize_t start, Py_ssize_t end)
 
    Return the number of non-overlapping occurrences of *substr* in
    ``str[start:end]``.  Return ``-1`` if an error occurred.
 
-   .. versionchanged:: 2.5
-      This function returned an :ctype:`int` type and used an :ctype:`int`
-      type for *start* and *end*. This might require changes in your code for
-      properly supporting 64-bit systems.
-
 
 .. cfunction:: PyObject* PyUnicode_Replace(PyObject *str, PyObject *substr, PyObject *replstr, Py_ssize_t maxcount)
 
@@ -994,10 +867,6 @@ They all return *NULL* or ``-1`` if an exception occurs.
    return the resulting Unicode object. *maxcount* == -1 means replace all
    occurrences.
 
-   .. versionchanged:: 2.5
-      This function used an :ctype:`int` type for *maxcount*. This might
-      require changes in your code for properly supporting 64-bit systems.
-
 
 .. cfunction:: int PyUnicode_Compare(PyObject *left, PyObject *right)
 
diff --git a/Doc/distutils/setupscript.rst b/Doc/distutils/setupscript.rst
index 2985437..bbc3498 100644
--- a/Doc/distutils/setupscript.rst
+++ b/Doc/distutils/setupscript.rst
@@ -454,9 +454,6 @@ way.  From the PyXML setup script::
           scripts=['scripts/xmlproc_parse', 'scripts/xmlproc_val']
           )
 
-.. versionchanged:: 2.7
-    All the scripts will also be added to the ``MANIFEST``
-    file if no template is provided. See :ref:`manifest`.
 
 .. _distutils-installing-package-data:
 
@@ -501,11 +498,6 @@ The corresponding call to :func:`setup` might be::
           )
 
 
-.. versionchanged:: 2.7
-    All the files that match ``package_data`` will be added to the ``MANIFEST``
-    file if no template is provided. See :ref:`manifest`.
-
-
 .. _distutils-additional-files:
 
 Installing Additional Files
@@ -542,11 +534,6 @@ without specifying a target directory, but this is not recommended, and the
 files directly in the target directory, an empty string should be given as the
 directory.
 
-.. versionchanged:: 2.7
-    All the files that match ``data_files`` will be added to the ``MANIFEST``
-    file if no template is provided. See :ref:`manifest`.
-
-
 
 .. _meta-data:
 
diff --git a/Doc/library/re.rst b/Doc/library/re.rst
index fade6ec..1259b11 100644
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -605,7 +605,7 @@ form.
       >>> re.split("(?m)^$", "foo\n\nbar\n")
       ['foo\n\nbar\n']
 
-   .. versionchanged:: 2.7,3.1
+   .. versionchanged:: 3.1
       Added the optional flags argument.
 
 
@@ -675,7 +675,7 @@ form.
    character ``'0'``.  The backreference ``\g<0>`` substitutes in the entire
    substring matched by the RE.
 
-   .. versionchanged:: 2.7,3.1
+   .. versionchanged:: 3.1
       Added the optional flags argument.
 
 
@@ -684,7 +684,7 @@ form.
    Perform the same operation as :func:`sub`, but return a tuple ``(new_string,
    number_of_subs_made)``.
 
-   .. versionchanged:: 2.7,3.1
+   .. versionchanged:: 3.1
       Added the optional flags argument.