summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-12-08 13:01:25 -0500
committerTim Graham <timograham@gmail.com>2015-12-08 13:05:26 -0500
commite4354d8d7c4af81258132fdd4ff6f643dc301385 (patch)
treee76de59948d6c0a725030309d93db38075bbc949
parent5eeb8edfbbc90d58c76599943282003f3e5ad4fa (diff)
[1.9.x] Refs #25886 -- Improved language in Python compatibility section of the release notes.
Backport of 26c26e83081d68035d6411b1acc17ba033e1876d from master
-rw-r--r--docs/releases/1.7.txt4
-rw-r--r--docs/releases/1.8.txt2
-rw-r--r--docs/releases/1.9.txt2
3 files changed, 5 insertions, 3 deletions
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index c063b06819..f1181749f5 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -23,8 +23,8 @@ Python compatibility
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.
+The Django 1.6 series is the last to support Python 2.6. Django 1.7 is the
+first release to support Python 3.4.
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 8ae3424386..906bae408a 100644
--- a/docs/releases/1.8.txt
+++ b/docs/releases/1.8.txt
@@ -28,6 +28,8 @@ Python compatibility
Django 1.8 requires Python 2.7, 3.2, 3.3, 3.4, or 3.5. We **highly recommend**
and only officially support the latest release of each series.
+Django 1.8 is the first release to support Python 3.5.
+
Due to the end of upstream support for Python 3.2 in February 2016, we won't
test Django 1.8.x on Python 3.2 after the end of 2016.
diff --git a/docs/releases/1.9.txt b/docs/releases/1.9.txt
index 79f812579d..b7e59a21bd 100644
--- a/docs/releases/1.9.txt
+++ b/docs/releases/1.9.txt
@@ -23,7 +23,7 @@ Python compatibility
Django 1.9 requires Python 2.7, 3.4, or 3.5. We **highly recommend** and only
officially support the latest release of each series.
-Since Django 1.8, we've dropped support for Python 3.2 and 3.3.
+The Django 1.8 series is the last to support Python 3.2 and 3.3.
What's new in Django 1.9
========================