From 7a2910d790baf6df417f7821f86caafd3b275f3c Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Wed, 11 Dec 2013 12:34:50 -0500
Subject: [PATCH] [1.6.x] Additions and edits to the 1.6.1 release notes.

---
 docs/releases/1.6.1.txt | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/docs/releases/1.6.1.txt b/docs/releases/1.6.1.txt
index 8ce6340c67..02899eae34 100644
--- a/docs/releases/1.6.1.txt
+++ b/docs/releases/1.6.1.txt
@@ -4,9 +4,9 @@ Django 1.6.1 release notes
 
 *Under development*
 
-This is Django 1.6.1, a bugfix release for Django 1.6.
-
-...
+This is Django 1.6.1, a bugfix release for Django 1.6. In addition to the bug
+fixes listed below, translations submitted since the 1.6 release are also
+included.
 
 Bug fixes
 =========
@@ -21,23 +21,23 @@ Bug fixes
   ``UnboundLocalError`` if :func:`~django.contrib.auth.get_user_model`
   raised an error (#21439).
 * Fixed a regression that prevented editable ``GenericRelation`` subclasses
-  from working in ``ModelForms``.
+  from working in ``ModelForms`` (#21428).
 * Added missing ``to_python`` method for ``ModelMultipleChoiceField`` which
   is required in Django 1.6 to properly detect changes from initial values
   (#21568).
 * Fixed ``django.contrib.humanize`` translations where the unicode sequence
   for the non-breaking space was returned verbatim (#21415).
 * Fixed :djadmin:`loaddata` error when fixture file name contained any dots
-  non related to file extensions (#21457) or when fixture path was relative
+  not related to file extensions (#21457) or when fixture path was relative
   but located in a subdirectory (#21551).
 * Fixed display of inline instances in formsets when parent has 0 for primary
   key (#21472).
 * Fixed a regression where custom querysets for foreign keys were overwritten
   if ``ModelAdmin`` had ordering set (#21405).
-* Removed mention of a feature in the ``--locale``/``-l`` option of
+* Removed mention of a feature in the ``--locale``/``-l`` option of the
   ``makemessages`` and ``compilemessages`` commands that never worked as
   promised: Support of multiple locale names separated by commas. It's still
-  possible to specify multiplle locales in one run by suing the option
+  possible to specify multiple locales in one run by using the option
   multiple times (#21488, #17181).
 * Fixed a regression that unnecessarily triggered settings configuration when
   importing ``get_wsgi_application`` (#21486).
@@ -45,7 +45,7 @@ Bug fixes
   backend (#21448).
 * Fixed a crash when a ``GeometryField`` uses a non-geometric widget (#21496).
 * Fixed password hash upgrade when changing the iteration count (#21535).
-* Fixed a bug in the debug view when the urlconf only contains one element
+* Fixed a bug in the debug view when the URLconf only contains one element
   (#21530).
 * Re-added missing search result count and reset link in changelist admin view
   (#21510).
@@ -55,3 +55,7 @@ Bug fixes
   formatted date in its output contained non-ASCII characters (#21358).
 * Fixed a crash in the debug view after an exception occurred on Python ≥ 3.3
   (#21443).
+* Fixed a crash in :class:`~django.db.models.ImageField` on some platforms
+  (Homebrew and RHEL6 reported) (#21355).
+* Fixed a regression when using generic relations in ``ModelAdmin.list_filter``
+  (#21431).