Commit d9ae7c6b authored by Luke Plant's avatar Luke Plant
Browse files

Corrected default value for ADMIN_MEDIA_PREFIX in docs, and added info about... 

Corrected default value for ADMIN_MEDIA_PREFIX in docs, and added info about how it integrates with staticfiles.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14551 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 102d230f

docs/ref/settings.txt

+8 −7
Original line number Diff line number Diff line
@@ -49,13 +49,14 @@ models, views and template tags. 
ADMIN_MEDIA_PREFIX

------------------



Default: ``'/media/'``



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 :setting:`MEDIA_URL` setting

(since the same URL cannot be mapped onto two different sets of

files).

Default: ``'/static/admin/'``



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 :setting:``MEDIA_URL`` setting (since the same URL cannot be

mapped onto two different sets of files). For integration with :doc:`staticfiles

</ref/contrib/staticfiles>`, this should be the same as

:setting:`STATICFILES_URL` followed by ``'admin/'``.



.. setting:: ADMINS