Index: django/conf/project_template/settings.py
===================================================================
--- django/conf/project_template/settings.py	(revision 4699)
+++ django/conf/project_template/settings.py	(working copy)
@@ -39,13 +39,13 @@
 MEDIA_ROOT = ''
 
 # URL that handles the media served from MEDIA_ROOT.
-# Example: "http://media.lawrence.com"
+# Examples: "http://media.lawrence.com", "/media/"
 MEDIA_URL = ''
 
 # 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: docs/settings.txt
===================================================================
--- docs/settings.txt	(revision 4699)
+++ 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.