Commit 33d7fbd8 authored by James Bennett's avatar James Bennett
Browse files

Fixed #4783: Added a note that "admin media" means "media used by the admin... 

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
parent edb3381c

docs/settings.txt

+5 −2
Original line number Diff line number Diff line
@@ -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

------