Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Corrected default value for ADMIN_MEDIA_PREFIX in docs, and added inf…

…o about how it integrates with staticfiles.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14551 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit d9ae7c6b372a005532720adc2e9b3597a87cd141 1 parent 102d230
Luke Plant authored November 13, 2010

Showing 1 changed file with 8 additions and 7 deletions. Show diff stats Hide diff stats

  1. 15  docs/ref/settings.txt
15  docs/ref/settings.txt
@@ -49,13 +49,14 @@ models, views and template tags.
49 49
 ADMIN_MEDIA_PREFIX
50 50
 ------------------
51 51
 
52  
-Default: ``'/media/'``
53  
-
54  
-The URL prefix for admin media -- CSS, JavaScript and images used by
55  
-the Django administrative interface. Make sure to use a trailing
56  
-slash, and to have this be different from the :setting:`MEDIA_URL` setting
57  
-(since the same URL cannot be mapped onto two different sets of
58  
-files).
  52
+Default: ``'/static/admin/'``
  53
+
  54
+The URL prefix for admin media -- CSS, JavaScript and images used by the Django
  55
+administrative interface. Make sure to use a trailing slash, and to have this be
  56
+different from the :setting:``MEDIA_URL`` setting (since the same URL cannot be
  57
+mapped onto two different sets of files). For integration with :doc:`staticfiles
  58
+</ref/contrib/staticfiles>`, this should be the same as
  59
+:setting:`STATICFILES_URL` followed by ``'admin/'``.
59 60
 
60 61
 .. setting:: ADMINS
61 62
 

0 notes on commit d9ae7c6

Please sign in to comment.
Something went wrong with that request. Please try again.