From 10fb0c4249ad4c06b0bf180ae23cc70bd0b26a5e Mon Sep 17 00:00:00 2001
From: Karl Hobley <karlhobley10@gmail.com>
Date: Thu, 7 May 2015 10:12:31 +0100
Subject: [PATCH] Changelog/release notes/contributors for #1176

---
 CHANGELOG.txt         | 3 +++
 CONTRIBUTORS.rst      | 2 ++
 docs/releases/1.0.rst | 7 +++++++
 3 files changed, 12 insertions(+)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index e101114a53..725cde0cd2 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -18,6 +18,9 @@ Changelog
  * Dropped Django 1.6 support
  * Dropped Python 2.6 and 3.2 support
  * Dropped Elasticsearch 0.90.x support
+ * Serving documents will now use django-sendfile if it's configured (Jordi Joan)
+ * Documents are now served with correct mime-type (Jordi Joan, Damian Moore)
+ * Support for If-Modified-Since HTTP header (Jordi Joan)
  * Search view accepts "page" GET parameter in line with pagination
  * Reversing `django.contrib.auth.admin.login` will no longer lead to Wagtails login view (making it easier to have front end views)
  * Removed dependency on `LOGIN_URL` and `LOGIN_REDIRECT_URL` settings
diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 92b8bd1f56..a96f47da4c 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -48,6 +48,8 @@ Contributors
 * Claudemiro
 * Tiago Henriques
 * Arne Schauf
+* Jordi Joan
+* Damian Moore
 
 Translators
 ===========
diff --git a/docs/releases/1.0.rst b/docs/releases/1.0.rst
index 6806e6b5b3..3e16edb48d 100644
--- a/docs/releases/1.0.rst
+++ b/docs/releases/1.0.rst
@@ -97,6 +97,13 @@ Admin
  * 'static' template tags are now used throughout the admin templates, in place of ``STATIC_URL``
 
 
+Docs
+----
+
+ * Support for ``django-sendfile`` added
+ * Documents now served with correct mime-type
+ * Support for ``If-Modified-Since`` HTTP header
+
 
 Project template
 ----------------