summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-10-24 09:36:29 -0400
committerTim Graham <timograham@gmail.com>2015-10-26 10:13:50 -0400
commitec388ee174195b2459a60c2a35755582e6808d62 (patch)
treeec79370c6c70b3a7296d6a025368ad3e82a6a283 /docs
parent1a6258c0905dfb88259393495f80d3c72015574d (diff)
[1.9.x] Documented Python 3.5 support for Django 1.8.
Forwardport of d27085b02d58ecf8b72e7189b6a5feaf634ec977 from stable/1.8.x
Diffstat (limited to 'docs')
-rw-r--r--docs/faq/install.txt4
-rw-r--r--docs/releases/1.8.6.txt3
-rw-r--r--docs/releases/1.8.txt4
3 files changed, 6 insertions, 5 deletions
diff --git a/docs/faq/install.txt b/docs/faq/install.txt
index ac4fac28f1..84acb55079 100644
--- a/docs/faq/install.txt
+++ b/docs/faq/install.txt
@@ -45,8 +45,8 @@ What Python version can I use with Django?
============== ===============
Django version Python versions
============== ===============
-1.4 2.5, 2.6, 2.7
-**1.7, 1.8** **2.7** and **3.2, 3.3, 3.4**
+1.7 2.7 and 3.2, 3.3, 3.4
+**1.8** **2.7** and **3.2, 3.3, 3.4, 3.5**
1.9 2.7, 3.4, 3.5
============== ===============
diff --git a/docs/releases/1.8.6.txt b/docs/releases/1.8.6.txt
index a17af96380..d2f3bd8898 100644
--- a/docs/releases/1.8.6.txt
+++ b/docs/releases/1.8.6.txt
@@ -4,7 +4,8 @@ Django 1.8.6 release notes
*Under Development*
-Django 1.8.6 fixes several bugs in 1.8.5.
+Django 1.8.6 adds official support for Python 3.5 and fixes several bugs in
+1.8.5.
Bugfixes
========
diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt
index 1cbc249d83..30204209d9 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, 3.2, 3.3, or 3.4. We **highly
-recommend** and only officially support the latest release of each series.
+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.
What's new in Django 1.8
========================