From dc3b524f6c0c513425f21434b44f3d9ef2d923c1 Mon Sep 17 00:00:00 2001 From: Ramiro Morales Date: Sun, 14 Nov 2010 15:50:01 +0000 Subject: [PATCH] [1.2.X] Fixed #10650 -- Clarified description of MEDIA_ROOT in setting files. Thanks jjconti, tvon, vak, Muhammad Alkarouri and thiggins for their work. Backport of [14560] from trunk git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14561 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 e86f1055f5..7746be144a 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 path to the directory that holds media. +# 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 c49df24ce5..256720c2d1 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 path to the directory that holds media. +# Absolute filesystem path to the directory that will hold user uploaded files. # Example: "/home/media/media.lawrence.com/" MEDIA_ROOT = ''