From 33d7fbd82dff80dc20380d107b4478761e4047a3 Mon Sep 17 00:00:00 2001 From: James Bennett Date: Tue, 18 Mar 2008 22:36:30 +0000 Subject: [PATCH] Fixed #4783: Added a note that "admin media" means "media used by the admin app", and that ADMIN_MEDIA_PREFIX and MEDIA_URL should not be the same value. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7312 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/settings.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/settings.txt b/docs/settings.txt index 792c59b3c4..fb2e04f1ea 100644 --- a/docs/settings.txt +++ b/docs/settings.txt @@ -185,8 +185,11 @@ ADMIN_MEDIA_PREFIX Default: ``'/media/'`` -The URL prefix for admin media -- CSS, JavaScript and images. Make sure to use -a trailing slash. +The URL prefix for admin media -- CSS, JavaScript and images used by +the Django administrative interface. Make sure to use a trailing +slash, and to have this be different from the ``MEDIA_URL`` setting +(since the same URL cannot be mapped onto two different sets of +files). ADMINS ------