From 030c6b9548a935306f6233b86f69484a580059e9 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@kaed.uk>
Date: Thu, 26 Oct 2017 13:54:17 +0100
Subject: [PATCH] Changelog/release notes for #3925, #3930 and #3974

---
 CHANGELOG.txt         | 3 +++
 docs/releases/2.0.rst | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 029835b10..39a2e42a3 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -5,12 +5,15 @@ Changelog
 ~~~~~~~~~~~~~~~~
 
  * Removed support for Python 2.7, Django 1.8 and Django 1.10
+ * Moved Wagtail API v1 implementation (`wagtail.contrib.api`) to an external app (https://github.com/wagtail/wagtailapi_legacy) (Karl Hobley)
+ * Implement ordering by date in form submission view (LB (Ben Johnston))
  * Elasticsearch scroll API is now used when fetching more than 100 search results (Karl Hobley)
  * Added hidden field to the form builder (Ross Crawford-d'Heureuse)
  * Image usage count now shows on delete confirmation page when WAGTAIL_USAGE_COUNT_ENABLED is active (Kees Hink)
  * Fix: Do not remove stopwords when generating slugs from non-ASCII titles, to avoid issues with incorrect word boundaries (Sævar Öfjörð Magnússon)
  * Fix: The PostgreSQL search backend now preserves ordering of the `QuerySet` when searching with `order_by_relevance=False` (Bertrand Bordage)
  * Fix: Using `modeladmin_register` as a decorator no longer replaces the decorated class with `None` (Tim Heap)
+ * Fix: Fixed crash in XML sitemap generator when all pages on the site are private (Stein Strindhaug)
 
 1.13 (16.10.2017)
 ~~~~~~~~~~~~~~~~~
diff --git a/docs/releases/2.0.rst b/docs/releases/2.0.rst
index cd17b5436..c3a8bcd9c 100644
--- a/docs/releases/2.0.rst
+++ b/docs/releases/2.0.rst
@@ -13,6 +13,8 @@ What's new
 Other features
 ~~~~~~~~~~~~~~
 
+ * Moved Wagtail API v1 implementation (``wagtail.contrib.api``) to an `external app <https://github.com/wagtail/wagtailapi_legacy>`_ (Karl Hobley)
+ * Implement ordering by date in form submission view (LB (Ben Johnston))
  * Elasticsearch scroll API is now used when fetching more than 100 search results (Karl Hobley)
  * Added hidden field to the form builder (Ross Crawford-d'Heureuse)
  * Image usage count now shows on delete confirmation page when WAGTAIL_USAGE_COUNT_ENABLED is active (Kees Hink)
@@ -24,6 +26,7 @@ Bug fixes
  * Do not remove stopwords when generating slugs from non-ASCII titles, to avoid issues with incorrect word boundaries (Sævar Öfjörð Magnússon)
  * The PostgreSQL search backend now preserves ordering of the ``QuerySet`` when searching with ``order_by_relevance=False`` (Bertrand Bordage)
  * Using ``modeladmin_register`` as a decorator no longer replaces the decorated class with ``None`` (Tim Heap)
+ * Fixed crash in XML sitemap generator when all pages on the site are private (Stein Strindhaug)
 
 
 Upgrade considerations