From b422b9cfbace3b2b0ace4e4e7123e640a9addb93 Mon Sep 17 00:00:00 2001
From: milde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>
Date: Mon, 20 Apr 2015 10:57:46 +0000
Subject: [PATCH] Move development plan (single 2/3 source) from RELEASE-NOTES
 to todo list.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@7883 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 docutils/RELEASE-NOTES.txt | 13 +++++--------
 docutils/docs/dev/todo.txt | 11 +++++++++++
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/docutils/RELEASE-NOTES.txt b/docutils/RELEASE-NOTES.txt
index 353281bc3..7e6663f1b 100644
--- a/docutils/RELEASE-NOTES.txt
+++ b/docutils/RELEASE-NOTES.txt
@@ -22,6 +22,9 @@ Future changes
 
 * remove the `handle_io_errors` option from io.FileInput/Output.
 
+  .. used by Sphinx up to version 1.3.1,
+     see https://github.com/sphinx-doc/sphinx/issues/1834
+
 * »Prune« the doctree (no change to the reST input syntax):
 
   - "doctest" element -> literal block with "pycon" (python-console)
@@ -29,14 +32,8 @@ Future changes
   - special admonitions (note, hint, warning, ...) -> generic "admonition"
     element with class attribute and auto-generated title.
 
-* Move to single source for Python 2 and Python 3, slowly.
-  See `Porting Python 2 Code to Python 3`_ and
-  `future: clean single-source support for Python 2/3`_
-
-  - Drop support for python 2.4 after release 0.12.
+* Drop support for python 2.4 after release 0.13.
 
-.. _Porting Python 2 Code to Python 3: https://docs.python.org/3/howto/pyporting.html
-.. _future\: clean single-source support for Python 2/3: http://python-future.org
 
 Changes Since 0.12
 ==================
@@ -44,7 +41,7 @@ Changes Since 0.12
 * docutils/writers/
 
   - New HTML writers generating `HTML 5`_ and `XHTML 1.1`_.
-    
+
     New stylesheet ``html-base.css`` for default layout using CSS 2.1.
 
 * tools/
diff --git a/docutils/docs/dev/todo.txt b/docutils/docs/dev/todo.txt
index 467375d1c..bb904c7f1 100644
--- a/docutils/docs/dev/todo.txt
+++ b/docutils/docs/dev/todo.txt
@@ -71,6 +71,17 @@ Many of these are now handled by Sphinx_
 General
 =======
 
+* Move to single source for Python 2 and Python 3.
+  (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:
+      http://python-future.org
+
 * Encoding of command line arguments can only be guessed:
 
   * try UTF-8/strict first, then try the locale's encoding with
-- 
2.11.4.GIT