Author: lukeplant
Date: 2010-11-12 21:55:06 -0600 (Fri, 12 Nov 2010)
New Revision: 14551

Modified:
   django/trunk/docs/ref/settings.txt
Log:
Corrected default value for ADMIN_MEDIA_PREFIX in docs, and added info about 
how it integrates with staticfiles.

Modified: django/trunk/docs/ref/settings.txt
===================================================================
--- django/trunk/docs/ref/settings.txt  2010-11-12 19:47:41 UTC (rev 14550)
+++ django/trunk/docs/ref/settings.txt  2010-11-13 03:55:06 UTC (rev 14551)
@@ -49,13 +49,14 @@
 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
 

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.

Reply via email to