Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
  • Loading branch information...
commit 33d7fbd82dff80dc20380d107b4478761e4047a3 1 parent edb3381
James Bennett ubernostrum authored
Showing with 5 additions and 2 deletions.
  1. +5 −2 docs/settings.txt
7 docs/settings.txt
View
@@ -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
------
Please sign in to comment.
Something went wrong with that request. Please try again.