Ticket #2891: 2891.2.patch

django/conf/global_settings.py

@@ -157 +157 @@
 
 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
 # trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
+# Examples: "http://foo.com/admin_media/", "/admin_media/".
+# The default in project_template/settings.py is now '/admin_media/', but the 
+# default here has been left as '/media/' for backwards compatibility.
 ADMIN_MEDIA_PREFIX = '/media/'
 
 # Default e-mail address to use for various automated correspondence from

django/conf/project_template/settings.py

@@ -44 +44 @@
 
 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
 # trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/media/'
+# Examples: "http://foo.com/admin_media/", "/admin_media/".
+ADMIN_MEDIA_PREFIX = '/admin_media/'
 
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = ''

django/contrib/admin/templatetags/admin_modify.py

@@ -28 +28 @@
 
     could return::
 
-        <script type="text/javascript" src="/media/admin/js/calendar.js">
+        <script type="text/javascript" src="/admin_media/admin/js/calendar.js">
     """
     if not absolute_url_re.match(script_path):
         script_path = '%s%s' % (settings.ADMIN_MEDIA_PREFIX, script_path)

docs/fastcgi.txt

@@ -195 +195 @@
 directive, as explained in the previous section).
 
 In this example, we tell Apache to use FastCGI to handle any request that
-doesn't represent a file on the filesystem and doesn't start with ``/media/``.
-This is probably the most common case, if you're using Django's admin site::
+doesn't represent a file on the filesystem and doesn't start with
+``/admin_media/``. This is probably the most common case, if you're using
+Django's admin site::
 
     <VirtualHost 12.34.56.78>
       ServerName example.com
       DocumentRoot /home/user/public_html
-      Alias /media /home/user/python/django/contrib/admin/media
+      Alias /admin_media /home/user/python/django/contrib/admin/media
       RewriteEngine On
       RewriteRule ^/(media.*)$ /$1 [QSA,L,PT]
       RewriteCond %{REQUEST_FILENAME} !-f
@@ -236 +237 @@
         ),
     )
     alias.url = (
-        "/media/" => "/home/user/django/contrib/admin/media/",
+        "/admin_media/" => "/home/user/django/contrib/admin/media/",
     )
 
     url.rewrite-once = (

docs/settings.txt

@@ -188 +188 @@
 The URL prefix for admin media -- CSS, JavaScript and images. Make sure to use
 a trailing slash.
 
+Note that the default in a ``settings.py`` file created with
+`django-admin.py startproject`_ is ``'/admin_media/'`` (the fall-back default
+remains ``'/media/'`` for backwards compatibility).
+
+.. _django-admin.py startproject: ../django-admin/#startproject-projectname
+
 ADMINS
 ------