summaryrefslogtreecommitdiff
path: root/docs/internals
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2012-11-17 22:38:19 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2012-11-17 23:05:16 +0100
commita586f2a7e56b854bb13403524259289974c7232c (patch)
tree9887c9424e6a9fe14b57fa038ea0b71a24f1c907 /docs/internals
parent9fa6aa9534efe00afbdd733b70a90ec555730891 (diff)
[1.5.x] Fixed #19291 -- Completed deprecation of ADMIN_MEDIA_PREFIX.
Backport of 9b755a2 from master.
Diffstat (limited to 'docs/internals')
-rw-r--r--docs/internals/deprecation.txt9
1 files changed, 5 insertions, 4 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index 9fd92db2b4..414da30ff8 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -140,6 +140,11 @@ these changes.
removed. In its place use
:class:`~django.contrib.staticfiles.handlers.StaticFilesHandler`.
+* The template tags library ``adminmedia`` and the template tag ``{%
+ admin_media_prefix %}`` will be removed in favor of the generic static files
+ handling. (This is faster than the usual deprecation path; see the
+ :doc:`Django 1.4 release notes</releases/1.4>`.)
+
* The :ttag:`url` and :ttag:`ssi` template tags will be
modified so that the first argument to each tag is a template variable, not
an implied string. In 1.4, this behavior is provided by a version of the tag
@@ -232,10 +237,6 @@ these changes.
:setting:`LOGGING` setting should include this filter explicitly if
it is desired.
-* The template tag
- :func:`django.contrib.admin.templatetags.adminmedia.admin_media_prefix`
- will be removed in favor of the generic static files handling.
-
* The builtin truncation functions :func:`django.utils.text.truncate_words`
and :func:`django.utils.text.truncate_html_words` will be removed in
favor of the ``django.utils.text.Truncator`` class.