summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-10-05 09:16:53 -0400
committerTim Graham <timograham@gmail.com>2015-10-05 14:20:11 -0400
commitbf42888801e927104b7f116df48bacbbda826113 (patch)
tree0da8ffb0b261bc350a806a6218dcab00b7aaba9f
parent9c60752ba5c62b08a29662e2cc758feaab315f67 (diff)
[1.8.x] Fixed #25502 -- Added supported Python versions in 1.7, 1.8 release notes.
Backport of b215a3ab63d1c34746855594656e988561484fe3 from master
-rw-r--r--docs/releases/1.7.txt8
-rw-r--r--docs/releases/1.8.txt4
2 files changed, 7 insertions, 5 deletions
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index 1bf8c442b3..8ed76da467 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -20,9 +20,11 @@ and some features have reached the end of their deprecation process and
Python compatibility
====================
-Django 1.7 requires Python 2.7 or above, though we **highly recommend**
-the latest minor release. Support for Python 2.6 has been dropped and support
-for Python 3.4 has been added.
+Django 1.7 requires Python 2.7, 3.2, 3.3, or 3.4. We **highly recommend** and
+only officially support the latest release of each series.
+
+Since Django 1.6, support for Python 2.6 has been dropped and support for
+Python 3.4 has been added.
This change should affect only a small number of Django users, as most
operating-system vendors today are shipping Python 2.7 or newer as their default
diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt
index ec35dbe7a2..40405019d6 100644
--- a/docs/releases/1.8.txt
+++ b/docs/releases/1.8.txt
@@ -25,8 +25,8 @@ end 6 months from the release date of Django 1.8.
Python compatibility
====================
-Like Django 1.7, Django 1.8 requires Python 2.7 or above, though we
-**highly recommend** the latest minor release.
+Like Django 1.7, Django 1.8 requires Python 2.7, 3.2, 3.3, or 3.4. We **highly
+recommend** and only officially support the latest release of each series.
What's new in Django 1.8
========================