diff options
| author | Luke Plant <L.Plant.98@cantab.net> | 2010-11-13 03:55:06 +0000 |
|---|---|---|
| committer | Luke Plant <L.Plant.98@cantab.net> | 2010-11-13 03:55:06 +0000 |
| commit | d9ae7c6b372a005532720adc2e9b3597a87cd141 (patch) | |
| tree | 1036613c56aef4c409877c078afaaf4359d5b289 /docs/ref/settings.txt | |
| parent | 102d230f94e2fc4e5bbe2d6b3a013b2f8bcd8415 (diff) | |
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
Diffstat (limited to 'docs/ref/settings.txt')
| -rw-r--r-- | docs/ref/settings.txt | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 66c6e264af..b394cd75b0 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -49,13 +49,14 @@ models, views and template tags. ADMIN_MEDIA_PREFIX ------------------ -Default: ``'/media/'`` +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). +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 |