diff options
| author | Tim Graham <timograham@gmail.com> | 2017-08-11 11:17:08 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-08-11 11:18:09 -0400 |
| commit | bca1ffc87afaff83072030890894a73d3e2478e8 (patch) | |
| tree | 3e0b66602c6c4b59cb8a8a1d440da5a79a9f6efc /docs | |
| parent | 93b53fb942c2b16e2f7079b86d18bcf800a3f368 (diff) | |
[1.11.x] Fixed #27855 -- Updated docs for Python 3.4 support in Django 2.0.
Backport of abd723c6a010be1bc06687d21e8841e07af6fde3 from master
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/faq/install.txt | 3 | ||||
| -rw-r--r-- | docs/releases/1.11.txt | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/docs/faq/install.txt b/docs/faq/install.txt index 980f0182ca..12482362d8 100644 --- a/docs/faq/install.txt +++ b/docs/faq/install.txt @@ -49,7 +49,8 @@ Django version Python versions 1.8 2.7, 3.2 (until the end of 2016), 3.3, 3.4, 3.5 1.9, 1.10 2.7, 3.4, 3.5 1.11 2.7, 3.4, 3.5, 3.6 -2.0 3.5+ +2.0 3.4, 3.5, 3.6 +2.1 3.5, 3.6, 3.7 ============== =============== For each version of Python, only the latest micro release (A.B.C) is officially diff --git a/docs/releases/1.11.txt b/docs/releases/1.11.txt index 953c2325fa..3da71a0dd7 100644 --- a/docs/releases/1.11.txt +++ b/docs/releases/1.11.txt @@ -27,7 +27,7 @@ release to support Python 3.6. We **highly recommend** and only officially support the latest release of each series. The Django 1.11.x series is the last to support Python 2. The next major -release, Django 2.0, will only support Python 3.5+. +release, Django 2.0, will only support Python 3.4+. Deprecating warnings are no longer loud by default ================================================== |