summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/settings.txt13
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