summaryrefslogtreecommitdiff
path: root/docs/ref
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/ref
parent9fa6aa9534efe00afbdd733b70a90ec555730891 (diff)
[1.5.x] Fixed #19291 -- Completed deprecation of ADMIN_MEDIA_PREFIX.
Backport of 9b755a2 from master.
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/settings.txt10
1 files changed, 0 insertions, 10 deletions
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</releases/1.4>` for
- more information.
-
.. setting:: AUTH_PROFILE_MODULE
AUTH_PROFILE_MODULE