From 94e2d3913d993259162b47d50ac2ab754a812f42 Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Mon, 24 Nov 2014 09:17:57 -0500
Subject: [PATCH] Added deprecation of template dirs parameter to timeline.

---
 docs/internals/deprecation.txt | 13 ++++++++++---
 docs/releases/1.8.txt          |  7 +++++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index 2a1839ba13c..1f4aca4cf38 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -51,9 +51,9 @@ details on these changes.
 * The following methods and properties of ``django.db.sql.query.Query`` will
   be removed:
 
-    * Properties: ``aggregates`` and ``aggregate_select``
-    * Methods: ``add_aggregate``, ``set_aggregate_mask``, and
-      ``append_aggregate_mask``.
+  * Properties: ``aggregates`` and ``aggregate_select``
+  * Methods: ``add_aggregate``, ``set_aggregate_mask``, and
+    ``append_aggregate_mask``.
 
 * ``django.template.resolve_variable`` will be removed.
 
@@ -88,6 +88,13 @@ details on these changes.
 * The backwards compatibility alias ``django.template.loader.BaseLoader`` will
   be removed.
 
+* The ``dirs`` parameter for the following functions will be removed:
+
+  * ``django.template.loader.get_template()``
+  * ``django.template.loader.select_template()``
+  * ``django.shortcuts.render()``
+  * ``django.shortcuts.render_to_response()``
+
 .. _deprecation-removed-in-1.9:
 
 1.9
diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt
index 911d3d63a30..867f021b6ad 100644
--- a/docs/releases/1.8.txt
+++ b/docs/releases/1.8.txt
@@ -1058,14 +1058,17 @@ now optional.
 ``dirs`` argument of template-finding functions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The following functions no longer accept a ``dirs`` parameter to override
-:setting:`TEMPLATE_DIRS`:
+The following functions will no longer accept a ``dirs`` parameter to override
+:setting:`TEMPLATE_DIRS` in Django 2.0:
 
 * :func:`django.template.loader.get_template()`
 * :func:`django.template.loader.select_template()`
 * :func:`django.shortcuts.render()`
 * :func:`django.shortcuts.render_to_response()`
 
+The parameter didn't work consistently across different template loaders and
+didn't work for included templates.
+
 ``django.template.loader.BaseLoader``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~