Remove 2.6 versionchanges, turn 2.7 ones into 3.1.
diff --git a/Doc/c-api/object.rst b/Doc/c-api/object.rst
index bf2f484..21051b9 100644
--- a/Doc/c-api/object.rst
+++ b/Doc/c-api/object.rst
@@ -262,8 +262,6 @@
allowing a type to explicitly indicate to the interpreter that it is not
hashable.
- .. versionadded:: 2.6
-
.. cfunction:: int PyObject_IsTrue(PyObject *o)
diff --git a/Doc/documenting/markup.rst b/Doc/documenting/markup.rst
index 80b43b9..05f9c4d 100644
--- a/Doc/documenting/markup.rst
+++ b/Doc/documenting/markup.rst
@@ -598,7 +598,7 @@
Example::
- .. versionadded:: 2.5
+ .. versionadded:: 3.1
The *spam* parameter.
Note that there must be no blank line between the directive head and the
diff --git a/Doc/extending/windows.rst b/Doc/extending/windows.rst
index aac1d2d..29e9e1e 100644
--- a/Doc/extending/windows.rst
+++ b/Doc/extending/windows.rst
@@ -107,10 +107,6 @@
to avoid confusion with a system library :file:`spam.dll` to which your module
could be a Python interface.
- .. versionchanged:: 2.5
- Previously, file names like :file:`spam.dll` (in release mode) or
- :file:`spam_d.dll` (in debug mode) were also recognized.
-
Now your options are:
#. Copy :file:`example.sln` and :file:`example.vcproj`, rename them to
diff --git a/Doc/library/http.cookies.rst b/Doc/library/http.cookies.rst
index 0b66072..7470c61 100644
--- a/Doc/library/http.cookies.rst
+++ b/Doc/library/http.cookies.rst
@@ -131,9 +131,6 @@
The keys are case-insensitive.
- .. versionadded:: 2.6
- The :attr:`httponly` attribute was added.
-
.. attribute:: Morsel.value
diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index c7c553f..d849247 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -562,16 +562,11 @@
If two :class:`Row` objects have exactly the same columns and their
members are equal, they compare equal.
- .. versionchanged:: 2.6
- Added iteration and equality (hashability).
-
.. method:: keys
This method returns a tuple of column names. Immediately after a query,
it is the first member of each tuple in :attr:`Cursor.description`.
- .. versionadded:: 2.6
-
Let's assume we initialize a table as in the example given above::
conn = sqlite3.connect(":memory:")
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index fb3a50d..79ca823 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -461,8 +461,6 @@
:exc:`OverflowError` on infinities and a :exc:`ValueError` on
NaNs.
- .. versionadded:: 2.6
-
Two methods support conversion to
and from hexadecimal strings. Since Python's floats are stored
internally as binary numbers, converting a float to or from a
diff --git a/Doc/library/test.rst b/Doc/library/test.rst
index 7bb1e01..bc3d714 100644
--- a/Doc/library/test.rst
+++ b/Doc/library/test.rst
@@ -353,5 +353,3 @@
Class used to record warnings for unit tests. See documentation of
:func:`check_warnings` above for more details.
- .. versionadded:: 2.6
-
diff --git a/Doc/library/warnings.rst b/Doc/library/warnings.rst
index f6b3db5..f6856ff 100644
--- a/Doc/library/warnings.rst
+++ b/Doc/library/warnings.rst
@@ -335,8 +335,3 @@
module returned when you import :mod:`warnings` whose filter will be
protected. This argument exists primarily for testing the :mod:`warnings`
module itself.
-
- .. versionchanged:: 3.0
-
- Constructor arguments turned into keyword-only arguments.
-
diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst
index 3583856..a4c7e4e 100644
--- a/Doc/library/zipfile.rst
+++ b/Doc/library/zipfile.rst
@@ -67,8 +67,8 @@
otherwise returns ``False``. *filename* may be a file or file-like object too.
This module does not currently handle ZIP files which have appended comments.
- .. versionchanged:: 2.7
- Support for file and file-like objects.
+ .. versionchanged:: 3.1
+ Support for file and file-like objects.
.. data:: ZIP_STORED