summaryrefslogtreecommitdiff
path: root/django/conf/project_template/settings.py
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-06-01 10:00:00 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-06-01 10:00:00 +0000
commitdcc090e4572959e11aa9ce0edf99785ac882d083 (patch)
treecb6c5ac36a5c23bc7767e0aef2ce5961e1296508 /django/conf/project_template/settings.py
parent250b84dd0e30ae916e2f033790098281dff0b9e2 (diff)
Fixed #4290 -- Added a warning about trailing slashes to the project settings
file. Thanks, mw@agami.at. git-svn-id: http://code.djangoproject.com/svn/django/trunk@5404 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/conf/project_template/settings.py')
-rw-r--r--django/conf/project_template/settings.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/django/conf/project_template/settings.py b/django/conf/project_template/settings.py
index cadb5146b7..36039d7e98 100644
--- a/django/conf/project_template/settings.py
+++ b/django/conf/project_template/settings.py
@@ -38,8 +38,9 @@ USE_I18N = True
# Example: "/home/media/media.lawrence.com/"
MEDIA_ROOT = ''
-# URL that handles the media served from MEDIA_ROOT.
-# Example: "http://media.lawrence.com"
+# URL that handles the media served from MEDIA_ROOT. Make sure to use a
+# trailing slash if there is a path component (optional in other cases).
+# Examples: "http://media.lawrence.com", "http://example.com/media/"
MEDIA_URL = ''
# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a