summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/internals/deprecation.txt5
-rw-r--r--docs/releases/2.1.txt6
2 files changed, 11 insertions, 0 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index f601b035ca..df817041df 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -33,6 +33,11 @@ details on these changes.
* ``django.utils.http.cookie_date()`` will be removed.
+* The ``staticfiles`` and ``admin_static`` template tag libraries will be
+ removed.
+
+* ``django.contrib.staticfiles.templatetags.static()`` will be removed.
+
See the :ref:`Django 2.1 release notes <deprecated-features-2.1>` for more
details on these changes.
diff --git a/docs/releases/2.1.txt b/docs/releases/2.1.txt
index 3465f41ce5..d7de90903c 100644
--- a/docs/releases/2.1.txt
+++ b/docs/releases/2.1.txt
@@ -274,6 +274,12 @@ Miscellaneous
:func:`~django.utils.http.http_date`, which follows the format of the latest
RFC.
+* ``{% load staticfiles %}`` and ``{% load admin_static %}`` are deprecated
+ in favor of ``{% load static %}``, which works the same.
+
+* ``django.contrib.staticfiles.templatetags.static()`` is deprecated in favor
+ of ``django.templatetags.static.static()``.
+
.. _removed-features-2.1:
Features removed in 2.1