From 0e19076b1c587de2aadb22935825a60a9f6c142b Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@kaed.uk>
Date: Tue, 8 May 2018 14:50:53 +0100
Subject: [PATCH] Moved changelog/release note for #4503 to version 2.2

---
 CHANGELOG.txt           |  7 ++++++-
 docs/releases/2.1.rst   |  1 -
 docs/releases/2.2.rst   | 22 ++++++++++++++++++++++
 docs/releases/index.rst |  1 +
 4 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 docs/releases/2.2.rst

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index bd255323c..462c2aeba 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+2.2 (xx.xx.xxx) - IN DEVELOPMENT
+~~~~~~~~~~~~~~~
+
+ * Added another valid AudioBoom oEmbed pattern (Bertrand Bordage)
+
+
 2.1 (xx.xx.xxxx) - IN DEVELOPMENT
 ~~~~~~~~~~~~~~~~
 
@@ -29,7 +35,6 @@ Changelog
  * Expose reusable client-side code to build Draftail extensions (Thibaud Colas)
  * Added `WAGTAILFRONTENDCACHE_LANGUAGES` setting to specify the languages whose URLs are to be purged when using `i18n_patterns` (PyMan Claudio Marinozzi)
  * Added `extra_footer_actions` template blocks for customising the add/edit page views (Arthur Holzner)
- * Added another valid AudioBoom oEmbed pattern (Bertrand Bordage)
  * Fix: Status button on 'edit page' now links to the correct URL when live and draft slug differ (LB (Ben Johnston))
  * Fix: Image title text in the gallery and in the chooser now wraps for long filenames (LB (Ben Johnston), Luiz Boaretto)
  * Fix: Move image editor action buttons to the bottom of the form on mobile (Julian Gallo)
diff --git a/docs/releases/2.1.rst b/docs/releases/2.1.rst
index 77838c2c6..e02b736eb 100644
--- a/docs/releases/2.1.rst
+++ b/docs/releases/2.1.rst
@@ -64,7 +64,6 @@ Other features
  * Expose reusable client-side code to build Draftail extensions (Thibaud Colas)
  * Added ``WAGTAILFRONTENDCACHE_LANGUAGES`` setting to specify the languages whose URLs are to be purged when using ``i18n_patterns`` (PyMan Claudio Marinozzi)
  * Added ``extra_footer_actions`` template blocks for customising the add/edit page views (Arthur Holzner)
- * Added another valid AudioBoom oEmbed pattern (Bertrand Bordage)
 
 Bug fixes
 ~~~~~~~~~
diff --git a/docs/releases/2.2.rst b/docs/releases/2.2.rst
new file mode 100644
index 000000000..310261e49
--- /dev/null
+++ b/docs/releases/2.2.rst
@@ -0,0 +1,22 @@
+==========================================
+Wagtail 2.1 release notes - IN DEVELOPMENT
+==========================================
+
+.. contents::
+    :local:
+    :depth: 1
+
+
+What's new
+==========
+
+Other features
+~~~~~~~~~~~~~~
+
+ * Added another valid AudioBoom oEmbed pattern (Bertrand Bordage)
+
+Bug fixes
+~~~~~~~~~
+
+Upgrade considerations
+======================
diff --git a/docs/releases/index.rst b/docs/releases/index.rst
index 3c6656ad0..1bf603197 100644
--- a/docs/releases/index.rst
+++ b/docs/releases/index.rst
@@ -5,6 +5,7 @@ Release notes
    :maxdepth: 1
 
    upgrading
+   2.2
    2.1
    2.0.2
    2.0.1