summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2015-12-27 20:09:10 (GMT)
committerBrett Cannon <brett@python.org>2015-12-27 20:09:10 (GMT)
commit0792451ea49f53ac5832d5f489d68c32190a5de0 (patch)
tree71d87cb69dc573d0ed641b7166161c84deaf5737
parent1ed017ae92b32b27186d5793f6e58c526f350a2b (diff)
parent85622e4bc914383c087ef2e5944b14b10b22cff5 (diff)
downloadcpython-0792451ea49f53ac5832d5f489d68c32190a5de0.zip
cpython-0792451ea49f53ac5832d5f489d68c32190a5de0.tar.gz
cpython-0792451ea49f53ac5832d5f489d68c32190a5de0.tar.bz2
Merge for issue #25874
-rw-r--r--Doc/using/windows.rst8
-rw-r--r--Misc/ACKS1
2 files changed, 9 insertions, 0 deletions
diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst
index 2116c10..63de69f 100644
--- a/Doc/using/windows.rst
+++ b/Doc/using/windows.rst
@@ -24,6 +24,14 @@ core interpreter and library being used by a single user. The installer is also
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
index 57dfe7c..170e1d6 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1558,6 +1558,7 @@ Felix Wiemann
Gerry Wiener
Frank Wierzbicki
Santoso Wijaya
+Chris Wilcox
Bryce "Zooko" Wilcox-O'Hearn
Timothy Wild
Jakub Wilk