From 166dec84069c15ecb2bc3a5590f872febdc4709c Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Tue, 28 Aug 2018 14:40:08 -0400
Subject: [PATCH] Fixed #29718 -- Doc'd admin template collision backwards
 incompatibility in Django 2.1.

---
 docs/releases/2.1.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/releases/2.1.txt b/docs/releases/2.1.txt
index 471303c88f..59148ac9d2 100644
--- a/docs/releases/2.1.txt
+++ b/docs/releases/2.1.txt
@@ -377,6 +377,12 @@ Miscellaneous
 * The admin CSS class ``field-box`` is renamed to ``fieldBox`` to prevent
   conflicts with the class given to model fields named "box".
 
+* Since the admin's ``actions.html``, ``change_list_results.html``,
+  ``date_hierarchy.html``, ``pagination.html``, ``prepopulated_fields_js.html``,
+  ``search_form.html``, and ``submit_line.html`` templates can now be
+  overridden per app or per model, you may need to rename existing templates
+  with those names that were written for a different purpose.
+
 * ``QuerySet.raw()`` now caches its results like regular querysets. Use
   ``iterator()`` if you don't want caching.