[Python-checkins] cpython (merge 3.5 -> default): Merge for issue #25874

brett.cannon python-checkins at python.org
Sun Dec 27 15:09:16 EST 2015


https://hg.python.org/cpython/rev/c6bd004671a7
changeset:   99692:c6bd004671a7
parent:      99690:b02d256b8827
parent:      99691:5114871a3ac6
user:        Brett Cannon <brett at python.org>
date:        Sun Dec 27 12:09:10 2015 -0800
summary:
  Merge for issue #25874

files:
  Doc/using/windows.rst |  8 ++++++++
  Misc/ACKS             |  1 +
  2 files changed, 9 insertions(+), 0 deletions(-)


diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst
--- a/Doc/using/windows.rst
+++ b/Doc/using/windows.rst
@@ -24,6 +24,14 @@
 able to install for all users of a single machine, and a separate ZIP file is
 available for application-local distributions.
 
+Supported Versions
+------------------
+
+As specified in :pep:`11`, a Python release only supports a Windows platform
+while Microsoft considers the platform under extended support. This means that
+Python 3.5 supports Windows Vista and newer. If you require Windows XP support
+then please install Python 3.4.
+
 Installation Steps
 ------------------
 
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1558,6 +1558,7 @@
 Gerry Wiener
 Frank Wierzbicki
 Santoso Wijaya
+Chris Wilcox
 Bryce "Zooko" Wilcox-O'Hearn
 Timothy Wild
 Jakub Wilk

-- 
Repository URL: https://hg.python.org/cpython


More information about the Python-checkins mailing list