From 554ce992da40ecdfe86a6e735f32fa322ea94fa9 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@kaed.uk>
Date: Wed, 12 Apr 2017 16:30:25 +0100
Subject: [PATCH] Changelog/release note for postgres search engine

---
 CHANGELOG.txt          |  1 +
 docs/releases/1.10.rst | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 48dc61abd..3d8b5c444 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,7 @@ Changelog
 1.10 (xx.xx.xxxx) - IN DEVELOPMENT
 ~~~~~~~~~~~~~~~~~
 
+ * Added PostgreSQL search engine (Bertrand Bordage, Jaap Roes, Arne de Laat, Ramon de Jezus)
  * Django 1.11 support (Tim Graham, Matt Westcott, Mikalai Radchuk, Bertrand Bordage)
  * Dropped Django 1.9 and Python 3.3 support; note that Django 1.8.x is still supported
  * Dropped support for generating static sites using django-medusa
diff --git a/docs/releases/1.10.rst b/docs/releases/1.10.rst
index 9c6116ba6..9688d0b58 100644
--- a/docs/releases/1.10.rst
+++ b/docs/releases/1.10.rst
@@ -10,6 +10,19 @@ Wagtail 1.10 release notes - IN DEVELOPMENT
 What's new
 ==========
 
+PostgreSQL search engine
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+A new search engine has been added to Wagtail which uses PostgreSQL's builtin
+full-text search functionality. This means that if you use PostgreSQL to manage
+your database, you can now get a good quality search engine without needing
+to install Elasticsearch.
+
+To get started, see: :ref:`postgres_search`
+
+This feature was developed at the Arnhem sprint by Bertrand Bordage, Jaap Roes,
+Arne de Laat and Ramon de Jezus.
+
 Django 1.11 and Python 3.6 support
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~