From d91ba206a2c36da8bfbe83ef0bd3a77f69266204 Mon Sep 17 00:00:00 2001
From: R David Murray <rdmurray@bitdance.com>
Date: Tue, 24 Dec 2013 12:13:44 -0500
Subject: [PATCH] Mention Windows 2000 and OS/2 drops, python-config as shell
 script.

---
 Doc/whatsnew/3.4.rst | 15 ++++++++++++---
 Misc/NEWS            |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst
index 31c0d9197ad..ad9829723e6 100644
--- a/Doc/whatsnew/3.4.rst
+++ b/Doc/whatsnew/3.4.rst
@@ -1002,7 +1002,7 @@ the PEP does not alter any existing CPython APIs.
 Other build and C API changes
 -----------------------------
 
-Changes to Python's build process and to the C API include:
+Other changes to Python's build process and to the C API include:
 
 * The new :c:func:`Py_SetStandardStreamEncoding` pre-initialization API
   allows applications embedding the CPython interpreter to reliably force
@@ -1026,6 +1026,9 @@ Changes to Python's build process and to the C API include:
      and core development team in this case, as Argument Clinic will not
      be made available as a public API for third party use in Python 3.4.
 
+* New shell version of ``python-config``; can be used even when a python
+  interpreter is not available (for example, in cross compilation scenarios).
+
 
 Other improvements
 ==================
@@ -1126,9 +1129,15 @@ Removed
 =======
 
 * The unmaintained ``Misc/TextMate`` and ``Misc/vim`` directories have been
-  removed (see the devguide__ for what to use instead).
+  removed (see the `devguide <http://docs.python.org/devguide>`_
+  for what to use instead).
 
-__ http://docs.python.org/devguide
+
+* OS/2 support code has been removed from the source tree and build tools
+  (:issue:`16135`).
+
+* Windows 2000 support code has been removed from the source tree and build
+  tools (changeset e52df05b496a).
 
 
 Porting to Python 3.4
diff --git a/Misc/NEWS b/Misc/NEWS
index 5dfa63cd0dd..71e20b266ad 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -3297,7 +3297,7 @@ Build
 - Issue #15484: Fix _PYTHON_PROJECT_BASE for srcdir != builddir builds;
   use _PYTHON_PROJECT_BASE in distutils/sysconfig.py.
 
-- Drop support for Windows 2000.
+- Drop support for Windows 2000 (changeset e52df05b496a).
 
 - Issue #17029: Let h2py search the multiarch system include directory.