summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjrabbit <jackjrabbit@gmail.com>2016-06-02 14:50:45 -0700
committerTim Graham <timograham@gmail.com>2016-06-02 20:29:20 -0400
commit83ea51a2441ac497e4d94269bf2746409bf4cfd0 (patch)
tree8dc27267ee47fa80466aff5d0e2a600fe326cba8
parentcd4246aab1740d77fa6ebd66c7d2053634501598 (diff)
[1.10.x] Fixes #26700 -- Added how to upgrade to TEMPLATES link in 1.10 release notes.
Backport of d65e2899b2b25c62a4ead7aba121421c19e55bce from master
-rw-r--r--docs/releases/1.10.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/releases/1.10.txt b/docs/releases/1.10.txt
index 7f62de6bb5..c3fea46a7f 100644
--- a/docs/releases/1.10.txt
+++ b/docs/releases/1.10.txt
@@ -1217,7 +1217,8 @@ removed in Django 1.10 (please see the :ref:`deprecation timeline
* The backwards compatibility shim to allow ``FormMixin.get_form()`` to be
defined with no default value for its ``form_class`` argument is removed.
-* The following settings are removed:
+* The following settings are removed, and :doc:`you must upgrade
+ </ref/templates/upgrading>` to the :setting:`TEMPLATES` setting:
* ``ALLOWED_INCLUDE_ROOTS``
* ``TEMPLATE_CONTEXT_PROCESSORS``