summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMariusz Felisiak <felisiak.mariusz@gmail.com>2020-10-13 08:35:01 +0200
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2020-10-13 08:45:37 +0200
commitb4b8ca489534621ba2633a4037e5b9b4710bf88f (patch)
treefe8b46c00653cccb2649e1f43ac832887c492f30 /docs
parent01742aa932890423e39a08e414aadbb616f95c71 (diff)
[2.2.x] Refs #31040 -- Doc'd Python 3.9 compatibility.
Backport of e18156b6c35908f2a4026287b5225a6a4da8af1a from master.
Diffstat (limited to 'docs')
-rw-r--r--docs/faq/install.txt2
-rw-r--r--docs/releases/2.2.17.txt7
-rw-r--r--docs/releases/2.2.txt6
-rw-r--r--docs/releases/index.txt1
4 files changed, 12 insertions, 4 deletions
diff --git a/docs/faq/install.txt b/docs/faq/install.txt
index 5f322bc7e6..d3f79c2246 100644
--- a/docs/faq/install.txt
+++ b/docs/faq/install.txt
@@ -49,7 +49,7 @@ Django version Python versions
1.11 2.7, 3.4, 3.5, 3.6, 3.7 (added in 1.11.17)
2.0 3.4, 3.5, 3.6, 3.7
2.1 3.5, 3.6, 3.7
-2.2 3.5, 3.6, 3.7, 3.8 (added in 2.2.8)
+2.2 3.5, 3.6, 3.7, 3.8 (added in 2.2.8), 3.9 (added in 2.2.17)
============== ===============
For each version of Python, only the latest micro release (A.B.C) is officially
diff --git a/docs/releases/2.2.17.txt b/docs/releases/2.2.17.txt
new file mode 100644
index 0000000000..d574de6574
--- /dev/null
+++ b/docs/releases/2.2.17.txt
@@ -0,0 +1,7 @@
+===========================
+Django 2.2.17 release notes
+===========================
+
+*Expected November 2, 2020*
+
+Django 2.2.17 adds compatibility with Python 3.9.
diff --git a/docs/releases/2.2.txt b/docs/releases/2.2.txt
index 4e440e1c18..f602fd0b46 100644
--- a/docs/releases/2.2.txt
+++ b/docs/releases/2.2.txt
@@ -23,9 +23,9 @@ end in April 2020.
Python compatibility
====================
-Django 2.2 supports Python 3.5, 3.6, 3.7, and 3.8 (as of 2.2.8). We
-**highly recommend** and only officially support the latest release of each
-series.
+Django 2.2 supports Python 3.5, 3.6, 3.7, 3.8 (as of 2.2.8), and 3.9 (as of
+2.2.17). We **highly recommend** and only officially support the latest release
+of each series.
.. _whats-new-2.2:
diff --git a/docs/releases/index.txt b/docs/releases/index.txt
index 0138f89944..247b69e797 100644
--- a/docs/releases/index.txt
+++ b/docs/releases/index.txt
@@ -25,6 +25,7 @@ versions of the documentation contain the release notes for any later releases.
.. toctree::
:maxdepth: 1
+ 2.2.17
2.2.16
2.2.15
2.2.14