From 5844cdca38f1440a76f5f3505256e239084f0c3e Mon Sep 17 00:00:00 2001
From: Adrian Holovaty <adrian@holovaty.com>
Date: Tue, 16 Nov 2010 23:48:08 +0000
Subject: [PATCH] Small grammar fix in 'user-uploaded files' comment from
 [14560]

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14582 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/conf/global_settings.py           | 2 +-
 django/conf/project_template/settings.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index fab2d0f6de..3aa333ba91 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -255,7 +255,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 07a823b7c5..1d33dd13c9 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/"
 MEDIA_ROOT = ''