summaryrefslogtreecommitdiff
path: root/docs
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:51 -0500
commit975a451153d56561a84d5c2ca692bc10bd656b77 (patch)
tree8d111f1fd68c50f20d65a084928c02962c51a7f5 /docs
parent14e1e53a90c80e4d9e9b0f36218f25639a660957 (diff)
[1.8.x] Refs #25886 -- Improved language in Python compatibility section of the release notes.
Backport of 26c26e83081d68035d6411b1acc17ba033e1876d from master
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/1.7.txt4
-rw-r--r--docs/releases/1.8.txt2
2 files changed, 4 insertions, 2 deletions
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index 1110ee0d1a..63eef9e51a 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 84e3d5e7a6..bab4f07f96 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.