From 99960f8fbda634dad5d185411862a58208e803c9 Mon Sep 17 00:00:00 2001
From: milde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>
Date: Thu, 14 Jun 2012 20:39:55 +0000
Subject: [PATCH] Document latest fixes.

git-svn-id: https://docutils.svn.sourceforge.net/svnroot/docutils/trunk/docutils@7443 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 HISTORY.txt       | 14 +++++++++-----
 RELEASE-NOTES.txt | 21 ++++++++++++++++-----
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/HISTORY.txt b/HISTORY.txt
index 445384533..bfac80361 100644
--- a/HISTORY.txt
+++ b/HISTORY.txt
@@ -18,9 +18,13 @@ Changes Since 0.9
 
 * docutils/setup.py
 
-  - Fix [ 3527842 ]. Under Python 3, converted tests and tools are now
-    stored in the ``test3/`` and ``tools3/`` sub-directories and not
-    installed in the PYTHONPATH.
+  - Fix [ 3527842 ]. Under Python 3, converted tests and tools were
+    installed in the PYTHONPATH. Converted tests are now
+    stored in ``test3/``, tools no longer need conversion.
+
+    If you installed one of Docutils versions 0.7 ... 0.9 with
+    ``setup.py install`` under Python 3, remove the spurious
+    ``test/`` and ``tools/`` directories in the site library root.
 
 * docutils/test/
 
@@ -39,14 +43,14 @@ Changes Since 0.9
 
 * docutils/parsers/rst/directives/misc.py
 
-  - Fix [ 3525847 ]. Catch and report UnicodeEncodeError with 
+  - Fix [ 3525847 ]. Catch and report UnicodeEncodeError with
     ``locale == C`` and 8-bit char in path argument of `include` directive.
 
 * docutils/test/alltests.py
 
   - class `Tee`: catch UnicodeError when writing to "ascii" stream or
     file under Python 3.
-    
+
 Release 0.9 (2012-05-02)
 ========================
 
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 99462f985..38588ef20 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -19,6 +19,8 @@ more detailed list of changes, please see the `Docutils History`_.
 Future changes
 ==============
 
+* Support for Python 2.3 will be dropped in version 0.10.
+
 * docutils/math, docutils/error_reporting.py, and
   docutils/urischemes.py will move to the utils package
   Code importing these modules needs to adapt, e.g.::
@@ -42,11 +44,20 @@ Future changes
                is called with `handle_io_errors`,
   :0.10 + n+1: remove the `handle_io_errors` option.
 
-* end of python2.3 support with 0.10, most likely.
 
 Changes Since 0.9
 =================
 
+* docutils/setup.py
+
+  - Fix [ 3527842 ]. Under Python 3, converted tests and tools were
+    installed in the PYTHONPATH. Converted tests are now
+    stored in ``docutils/test3/``, tools no longer need conversion.
+
+    If you installed one of Docutils versions 0.7 ... 0.9 with
+    ``setup.py install`` under Python 3, remove the spurious
+    ``test/`` and ``tools/`` directories in the site library root.
+
 
 Release 0.9 (2012-05-02)
 =========================
@@ -93,14 +104,11 @@ Release 0.8.1 (2011-08-30)
   - Fix [ 3364658 ] (Change last file with Apache license to BSD-2-Clause)
     and [ 3395920 ] (correct copyright info for rst.el).
 
-* docutils/test/
-
-  -  Apply [ 3303733 ] and [ 3365041 ] to fix tests under py3k.
-
 * docutils/writers/latex2e/__init__.py
 
   - Clean up Babel language setting. Restores Sphinx compatibility.
 
+
 Release 0.8 (2011-07-07)
 ========================
 
@@ -158,6 +166,7 @@ Components:
 
 * and fixes and enhancements here and there.
 
+
 Release 0.7 (2010-07-07)
 ========================
 
@@ -202,6 +211,7 @@ General:
   - Python 3 support: copy test/ and tools/ to the build-dir
     and convert Python sources with 2to3.
 
+
 Release 0.6 (2009-10-11)
 ========================
 
@@ -321,6 +331,7 @@ General:
 
 * Enhance emacs support.
 
+
 Release 0.4 (2006-01-09)
 ========================
 
-- 
2.11.4.GIT