summaryrefslogtreecommitdiff
path: root/docs
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:06 -0400
commit9f31439e67989bfbe4ccdecf79b379b28351ceee (patch)
treece56d816b60025847a7a4b270ae33cefbb15f271 /docs
parent4b95f1b0fba1fd9f184de247f96703e664f7f77c (diff)
[1.9.x] Fixed #25502 -- Added supported Python versions in 1.7, 1.8 release notes.
Backport of b215a3ab63d1c34746855594656e988561484fe3 from master
Diffstat (limited to 'docs')
-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 ff6043a332..9ccbd815e1 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 a2d98656b6..79d387fc2f 100644
--- a/docs/releases/1.8.txt
+++ b/docs/releases/1.8.txt
@@ -25,8 +25,8 @@ 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
========================