summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamiro Morales <cramm0@gmail.com>2010-11-30 21:39:54 +0000
committerRamiro Morales <cramm0@gmail.com>2010-11-30 21:39:54 +0000
commitf1d4f713e563e8e352b870fe30426579dcc7b5ce (patch)
tree8500699fd339136db73dc1be6eb12e37279ad225
parent612825583857f0dfbfa0c0bb3bb3c64832302f8d (diff)
[1.2.X] Small grammar fix in 'user-uploaded files' comment from [14561]
Backport of r14582 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14755 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/conf/global_settings.py2
-rw-r--r--django/conf/project_template/settings.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index 7746be144a..86f59f0495 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -258,7 +258,7 @@ SECRET_KEY = ''
# Default file storage mechanism that holds media.
DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
-# Absolute filesystem path to the directory that will hold user uploaded files.
+# Absolute filesystem path to the directory that will hold user-uploaded files.
# Example: "/home/media/media.lawrence.com/"
MEDIA_ROOT = ''
diff --git a/django/conf/project_template/settings.py b/django/conf/project_template/settings.py
index 256720c2d1..686fadcc45 100644
--- a/django/conf/project_template/settings.py
+++ b/django/conf/project_template/settings.py
@@ -43,7 +43,7 @@ USE_I18N = True
# calendars according to the current locale
USE_L10N = True
-# Absolute filesystem path to the directory that will hold user uploaded files.
+# Absolute filesystem path to the directory that will hold user-uploaded files.
# Example: "/home/media/media.lawrence.com/"
MEDIA_ROOT = ''