From 3b7a4c6adc0b709bf08679b9b3299af512166626 Mon Sep 17 00:00:00 2001
From: Luke Plant <L.Plant.98@cantab.net>
Date: Tue, 1 Nov 2011 21:37:12 +0000
Subject: [PATCH] Fixed #17117 - ADMIN_MEDIA_PREFIX should still be visible in
 docs

Thanks to claudep for the report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17063 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 docs/ref/settings.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 999e2bad00..20366e353d 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -2148,6 +2148,16 @@ 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:: CACHE_BACKEND
 
 CACHE_BACKEND