From 9b755a298a55849bf8e831a46639999609aedfff Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Sat, 17 Nov 2012 22:38:19 +0100 Subject: Fixed #19291 -- Completed deprecation of ADMIN_MEDIA_PREFIX. --- docs/internals/deprecation.txt | 9 +++++---- docs/ref/settings.txt | 10 ---------- docs/releases/1.5.txt | 5 +++++ 3 files changed, 10 insertions(+), 14 deletions(-) (limited to 'docs') 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`.) + * 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. diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 5544c99dd1..9b222bf586 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -2210,16 +2210,6 @@ The default value for the X-Frame-Options header used by Deprecated settings =================== -.. setting:: ADMIN_MEDIA_PREFIX - -ADMIN_MEDIA_PREFIX ------------------- - -.. deprecated:: 1.4 - This setting has been obsoleted by the ``django.contrib.staticfiles`` app - integration. See the :doc:`Django 1.4 release notes` for - more information. - .. setting:: AUTH_PROFILE_MODULE AUTH_PROFILE_MODULE diff --git a/docs/releases/1.5.txt b/docs/releases/1.5.txt index c53518feaa..cffc0f23af 100644 --- a/docs/releases/1.5.txt +++ b/docs/releases/1.5.txt @@ -574,6 +574,11 @@ Miscellaneous HTML validation against pre-HTML5 Strict DTDs, you should add a div around it in your pages. +* The template tags library ``adminmedia``, which only contained the + deprecated template tag ``{% admin_media_prefix %}``, was removed. + Attempting to load it with ``{% load adminmedia %}`` will fail. If your + templates still contain that line you must remove it. + Features deprecated in 1.5 ========================== -- cgit v1.3