Index: django/conf/global_settings.py
===================================================================
--- django/conf/global_settings.py	(revision 5881)
+++ django/conf/global_settings.py	(working copy)
@@ -157,8 +157,8 @@
 
 # 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/'
 
 # Default e-mail address to use for various automated correspondence from
 # the site managers.
Index: django/conf/project_template/settings.py
===================================================================
--- django/conf/project_template/settings.py	(revision 5881)
+++ django/conf/project_template/settings.py	(working copy)
@@ -44,8 +44,8 @@
 
 # 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 = ''
Index: django/contrib/admin/templatetags/admin_modify.py
===================================================================
--- django/contrib/admin/templatetags/admin_modify.py	(revision 5881)
+++ django/contrib/admin/templatetags/admin_modify.py	(working copy)
@@ -28,7 +28,7 @@
 
     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)
Index: docs/fastcgi.txt
===================================================================
--- docs/fastcgi.txt	(revision 5779)
+++ docs/fastcgi.txt	(working copy)
@@ -195,13 +195,14 @@
 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,7 +237,7 @@
         ),
     )
     alias.url = (
-        "/media/" => "/home/user/django/contrib/admin/media/",
+        "/admin_media/" => "/home/user/django/contrib/admin/media/",
     )
 
     url.rewrite-once = (
Index: docs/settings.txt
===================================================================
--- docs/settings.txt	(revision 5779)
+++ docs/settings.txt	(working copy)
@@ -183,7 +183,7 @@
 ADMIN_MEDIA_PREFIX
 ------------------
 
-Default: ``'/media/'``
+Default: ``'/admin_media/'``
 
 The URL prefix for admin media -- CSS, JavaScript and images. Make sure to use
 a trailing slash.