From 6604cdfdaebff52b5c2446136e8ebc66412cee28 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Wed, 8 Aug 2018 16:04:28 +0100
Subject: [PATCH] Update documentation to indicate Django 2.1 support
---
CHANGELOG.txt | 6 ++++--
README.md | 2 +-
docs/getting_started/integrating_into_django.rst | 2 +-
docs/releases/2.3.rst | 9 +++++++++
docs/releases/upgrading.rst | 4 ++++
setup.py | 1 +
6 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 22eb1eadee..76d9eadf23 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,8 +1,10 @@
Changelog
=========
-2.3 (xx.xx.xxxx) - IN DEVELOPMENT
-~~~~~~~~~~~~~~~~
+2.3 LTS (xx.xx.xxxx) - IN DEVELOPMENT
+~~~~~~~~~~~~~~~~~~~~
+
+ * Added support for Django 2.1 (Ryan Verner, Matt Westcott)
2.2 (xx.xx.xxx) - IN DEVELOPMENT
diff --git a/README.md b/README.md
index 23e9ebd5bf..3f8f7840f5 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ Wagtail is used by NASA, Google, Oxfam, the NHS, Mozilla, MIT, the Red Cross, Sa
Wagtail supports:
-* Django 1.11.x and 2.0
+* Django 1.11.x, 2.0.x and 2.1.x
* Python 3.4, 3.5 and 3.6
* PostgreSQL, MySQL and SQLite as database backends
diff --git a/docs/getting_started/integrating_into_django.rst b/docs/getting_started/integrating_into_django.rst
index d6f55a15a8..1458229574 100644
--- a/docs/getting_started/integrating_into_django.rst
+++ b/docs/getting_started/integrating_into_django.rst
@@ -5,7 +5,7 @@ Integrating Wagtail into a Django project
Wagtail provides the ``wagtail start`` command and project template to get you started with a new Wagtail project as quickly as possible, but it's easy to integrate Wagtail into an existing Django project too.
-Wagtail is currently compatible with Django 1.11 and 2.0. First, install the ``wagtail`` package from PyPI:
+Wagtail is currently compatible with Django 1.11, 2.0 and 2.1. First, install the ``wagtail`` package from PyPI:
.. code-block:: console
diff --git a/docs/releases/2.3.rst b/docs/releases/2.3.rst
index 392921d6c4..8c69f3b83e 100644
--- a/docs/releases/2.3.rst
+++ b/docs/releases/2.3.rst
@@ -7,9 +7,18 @@ Wagtail 2.3 release notes - IN DEVELOPMENT
:depth: 1
+Wagtail 2.3 is designated a Long Term Support (LTS) release. Long Term Support releases will continue to receive maintenance updates as necessary to address security and data-loss related issues, up until the next LTS release (typically a period of 8 months).
+
+
What's new
==========
+Added Django 2.1 support
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+Wagtail is now compatible with Django 2.1. Compatibility fixes were contributed by Ryan Verner and Matt Westcott.
+
+
Other features
~~~~~~~~~~~~~~
diff --git a/docs/releases/upgrading.rst b/docs/releases/upgrading.rst
index fdf389f74c..956d739d25 100644
--- a/docs/releases/upgrading.rst
+++ b/docs/releases/upgrading.rst
@@ -29,6 +29,8 @@ Exceptionally, with 2.0 introducing breaking changes, 1.13 was designated as LTS
+-------------------+------------------------------------------+
| 1.13 LTS | October 2017 - November 2018 (expected) |
+-------------------+------------------------------------------+
+| 2.3 LTS | October 2018 - June 2019 (expected) |
++-------------------+------------------------------------------+
Deprecation policy
==================
@@ -133,4 +135,6 @@ The compatible versions of Django and Python for each Wagtail release are:
+-------------------+------------------------------+-----------------------------+
| 2.2 | 1.11, 2.0 | 3.4, 3.5, 3.6 |
+-------------------+------------------------------+-----------------------------+
+| 2.3 LTS | 1.11, 2.0, 2.1 | 3.4, 3.5, 3.6 |
++-------------------+------------------------------+-----------------------------+
diff --git a/setup.py b/setup.py
index c18cb25d96..a968907a73 100755
--- a/setup.py
+++ b/setup.py
@@ -95,6 +95,7 @@ https://github.com/wagtail/wagtail/.",
'Framework :: Django',
'Framework :: Django :: 1.11',
'Framework :: Django :: 2.0',
+ 'Framework :: Django :: 2.1',
'Framework :: Wagtail',
'Topic :: Internet :: WWW/HTTP :: Site Management',
],