Documentation update: Dropped support for Python 2.4, 2.5, 3.1, and 3.2.

No change to the code yet, but from now on constructs requiring 2.6 or later
can be checked in.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@8162 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

10 files changed, 43 insertions, 34 deletions

diff --git a/docutils/HISTORY.txt b/docutils/HISTORY.txt
index 80c2bac59..d6f9e8801 100644
--- a/docutils/HISTORY.txt
+++ b/docutils/HISTORY.txt
@@ -18,6 +18,7 @@ Changes Since 0.14
 
 * General
 
+  - Dropped support for Python 2.4, 2.5, 3.1, and 3.2.
   - infrastructure automatisms.
 
 * docutils/writers/latex2e/__init__.py
diff --git a/docutils/README.txt b/docutils/README.txt
index eed343d6e..e31d586a8 100644
--- a/docutils/README.txt
+++ b/docutils/README.txt
@@ -16,7 +16,7 @@ Quick-Start
 
 This is for those who want to get up & running quickly.
 
-1. Docutils requires Python (version 2.4 or later), available from
+1. Docutils requires Python (version 2.6 or later), available from
 
      http://www.python.org/
 
@@ -103,8 +103,8 @@ Requirements
 ============
 
 To run the code, Python_ must be installed.
-Docutils is compatible with Python versions from 2.4 up to 2.7 and
-versions 3.1 to 3.5 (cf. `Python 3 compatibility`_).
+Docutils is compatible with Python versions 2.6, 2.7, and
+versions 3.3 to 3.5 (cf. `Python 3 compatibility`_).
 
 Docutils uses the following packages for enhanced functionality, if they are
 installed:
diff --git a/docutils/RELEASE-NOTES.txt b/docutils/RELEASE-NOTES.txt
index 062175c52..0973793f2 100644
--- a/docutils/RELEASE-NOTES.txt
+++ b/docutils/RELEASE-NOTES.txt
@@ -22,9 +22,6 @@ For a more detailed list of changes, please see the `Docutils History`_.
 Future changes
 ==============
 
-* Drop support for Python 2.4, 2.5, 3.1, and 3.2 immediately after the 0.14
-  release.
-
 * Remove the `handle_io_errors` option from io.FileInput/Output.
   Used by Sphinx up to version 1.3.1, fixed in 1.3.2 (Nov 29, 2015).
 
@@ -41,6 +38,18 @@ Future changes
 .. _rst2html.py: docs/user/tools.html#rst2html-py
 
 
+Release 0.15b.dev
+=================
+
+.. Note::
+
+   Docutils 0.14.x is the last version supporting Python 2.4, 2.5, 
+   3.1, and 3.2.
+
+   Docutils 0.15.x is compatible with Python versions 2.6, 2.7 and 3.3 to 3.5
+   (cf. `Python 3 compatibility`_).
+
+
 Release 0.14 (2017-08-03)
 =========================
 
diff --git a/docutils/docs/dev/distributing.txt b/docutils/docs/dev/distributing.txt
index 770e83de5..3aeb6af24 100644
--- a/docutils/docs/dev/distributing.txt
+++ b/docutils/docs/dev/distributing.txt
@@ -28,7 +28,7 @@ Dependencies
 
 Docutils has the following dependencies:
 
-* Python 2.4 or later is required.  Use ">= Python 2.4" in the
+* Python 2.6 or later is required.  Use ">= Python 2.6" in the
   dependencies.
 
 * Docutils may optionally make use of the PIL (`Python Imaging
diff --git a/docutils/docs/dev/release.txt b/docutils/docs/dev/release.txt
index cd1f621c9..3671cc851 100644
--- a/docutils/docs/dev/release.txt
+++ b/docutils/docs/dev/release.txt
@@ -13,7 +13,7 @@
 Assumptions and their failure
 -----------------------------
 
-On the test machine python2.4, 2.5, 2.6, 2.7 and 3.2, 3.3, and 3.4
+On the test machine python 2.6, 2.7 and 3.2, 3.3, and 3.4
 are installed.
 Some in /usr/ some under /usr/local.
 
diff --git a/docutils/docs/dev/testing.txt b/docutils/docs/dev/testing.txt
index e3767aadf..f9d326b52 100644
--- a/docutils/docs/dev/testing.txt
+++ b/docutils/docs/dev/testing.txt
@@ -38,28 +38,25 @@ Python 3, ``cd`` to the package's root directory and do::
 Python Versions
 ===============
 
-A docutils release has a commitment to support a minimum version and 
+A docutils release has a commitment to support a minimum version and
 beyond. Before a release is cut, tests must pass in all supported python
 versions.
 
-The Docutils 0.10 release supports Python 2.4 or later. 
-Versions after 0.12 will drop python 2.4, supporting **2.5** and later.
+The Docutils 0.15 release supports Python 2.6 or later.
 
-Therefore, you should install python 2.5, as well as the latest Python 
-(3.4 at the time of this writing) installed and always run the tests on 
-all of them. In a pinch, the edge cases (2.5, and 3.4) should cover most 
-of it.
+Therefore, you should install python 2.6, 2.7 as well as 3.3 up to the
+latest Python (3.5 at the time of this writing) installed and always run the
+tests on all of them. In a pinch, the edge cases (2.6, and 3.5) should cover
+most of it.
 
 Good resources covering the differences between Python versions:
 
-* `What's New in Python 2.5`__
 * `What's New in Python 2.6`__
 * `What's New in Python 2.7`__
 * `What's New in Python 3.3`__
 * `What's New in Python 3.4`__
 * `PEP 290 - Code Migration and Modernization`__
 
-__ http://www.python.org/doc/2.5.2/whatsnew/whatsnew25.html
 __ http://docs.python.org/whatsnew/2.6.html
 __ http://docs.python.org/whatsnew/2.7.html
 __ https://docs.python.org/3/whatsnew/3.3.html
@@ -75,14 +72,14 @@ __ http://www.python.org/peps/pep-0290.html
 Testing across multiple python versions
 ---------------------------------------
 
-`pyenv`_ can be installed and configured (see `installing pyenv`_) to 
+`pyenv`_ can be installed and configured (see `installing pyenv`_) to
 test multiple python versions::
 
     # assuming your system runs 2.7.x
     pyenv install 2.6.9
     pyenv install 3.3.6
     pyenv install 3.4.3
-    pyenv global system 2.5.6 2.6.9 3.3.6 3.4.3
+    pyenv global system 2.6.9 3.3.6 3.4.3
 
     # reset your shims
     rm -rf ~/.pyenv/shims && pyenv rehash
@@ -90,15 +87,13 @@ test multiple python versions::
 This will give you ``python2.6``, ``python2.7``, ``python3.3`` and
 ``python3.4``. Along with that, ``pip2.6``, ``pip2.7`` and so on.
 
-To save time, you can use `tox`_ to test docutils on versions 2.6+. To
+To save time, you can use `tox`_. To
 install tox, you can use ``easy_install tox`` or ``pip install tox``.
 From shell::
 
     cd docutils
     tox
 
-Note: tox and virtualenv only supports python 2.6 and onward.
-
 .. _tox: https://tox.readthedocs.org/en/latest/
 .. _pyenv: https://github.com/yyuu/pyenv
 .. _installing pyenv: https://github.com/yyuu/pyenv#installation
diff --git a/docutils/docs/dev/todo.txt b/docutils/docs/dev/todo.txt
index 2e51d4851..d938bc111 100644
--- a/docutils/docs/dev/todo.txt
+++ b/docutils/docs/dev/todo.txt
@@ -75,8 +75,6 @@ General
   (Cf. `Porting Python 2 Code to Python 3`_ and
   `clean single-source support for Python 2/3`_.)
 
-  - Gradually phase out support for Python 2.4 and 2.5 first.
-
   .. _Porting Python 2 Code to Python 3:
       https://docs.python.org/3/howto/pyporting.html
   .. _clean single-source support for Python 2/3:
@@ -1307,6 +1305,9 @@ MathML_
   .. _mathweb wiki: http://www.mathweb.org/wiki/MathML
   .. _ConTeXT MathML page: http://wiki.contextgarden.net/MathML
 
+  A MathML to LaTeX XSLT sheet:
+  https://github.com/davidcarlisle/web-xslt/tree/master/pmml2tex
+
 
 ASCIIMath_
   Simple, ASCII based math input language (see also `ASCIIMath tutorial`_).
@@ -1317,8 +1318,18 @@ ASCIIMath_
     A more comprehensive implementation is ASCIIMathPython_ by
     Paul Trembley (also used in his sandbox projects).
 
-  * For conversion to LaTeX, there is a JavaScript script at
-    http://dlippman.imathas.com/asciimathtex/ASCIIMath2TeX.js
+  * For conversion to LaTeX, there is
+
+    - a JavaScript script at
+      http://dlippman.imathas.com/asciimathtex/ASCIIMath2TeX.js
+
+    - The javascript `asciimath-to-latex` AsciiMath to LaTex converter at
+      the node package manager
+      https://www.npmjs.com/package/asciimath-to-latex
+      and at GitHub https://github.com/tylerlong/asciimath-to-latex
+
+    - a javascript and a PHP converter script at GitHub
+      https://github.com/asciimath/asciimathml/tree/master/asciimath-based
 
   .. _ASCIIMath: http://www1.chapman.edu/~jipsen/mathml/asciimath.html
   .. _ASCIIMath tutorial:
diff --git a/docutils/docs/user/odt.txt b/docutils/docs/user/odt.txt
index af63816b5..0c7449ec6 100644
--- a/docutils/docs/user/odt.txt
+++ b/docutils/docs/user/odt.txt
@@ -41,9 +41,6 @@ Requirements
 In addition to the Docutils standard requirements, ``odtwriter``
 requires:
 
-- ElementTree --  Python (version 2.5 or later) now includes
-  ElementTree (``xml.etree.ElementTree``).
-
 - Optional -- `Pygments`_ is required if you want syntax
   highlighting of code in literal blocks.  See section `Syntax
   highlighting`_.
diff --git a/docutils/docutils/io.py b/docutils/docutils/io.py
index 1e5a56b9e..6c44fba4b 100644
--- a/docutils/docutils/io.py
+++ b/docutils/docutils/io.py
@@ -226,7 +226,7 @@ class FileInput(Input):
             if key == 'handle_io_errors':
                 sys.stderr.write('deprecation warning: '
                     'io.FileInput() argument `handle_io_errors` '
-                    'is ignored since "Docutils 0.10 (2012-12-16)" '
+                    'is ignored since Docutils 0.10 (2012-12-16) '
                     'and will soon be removed.')
             else:
                 raise TypeError('__init__() got an unexpected keyword '
diff --git a/docutils/setup.py b/docutils/setup.py
index 50e416d11..0642d3499 100755
--- a/docutils/setup.py
+++ b/docutils/setup.py
@@ -138,11 +138,9 @@ what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60
                  'docutils.writers',
                  'docutils.writers.html4css1',
                  'docutils.writers.html5_polyglot',
-                 # 'docutils.writers.xhtml11', # moved to the sandbox
                  'docutils.writers.pep_html',
                  'docutils.writers.s5_html',
                  'docutils.writers.latex2e',
-                 # 'docutils.writers.newlatex2e', # in the sandbox since 0.8
                  'docutils.writers.xetex',
                  'docutils.writers.odf_odt',
                  ],
@@ -196,8 +194,6 @@ classifiers = [
     'License :: OSI Approved :: BSD License',
     'License :: OSI Approved :: GNU General Public License (GPL)',
     'Operating System :: OS Independent',
-    'Programming Language :: Python :: 2.4',
-    'Programming Language :: Python :: 2.5',
     'Programming Language :: Python :: 2.6',
     'Programming Language :: Python :: 2.7',
     'Programming Language :: Python :: 3',