diff options
| author | Ramiro Morales <cramm0@gmail.com> | 2010-11-14 15:42:54 +0000 |
|---|---|---|
| committer | Ramiro Morales <cramm0@gmail.com> | 2010-11-14 15:42:54 +0000 |
| commit | 74f46c0ae2cbd7e0ccb80d4e5bd8bedadc8c6756 (patch) | |
| tree | 9780e289c9c8aeb170c3b7d1afc432ede072a80e /django/conf | |
| parent | 2b344d262815d715be63871e5434c109f85d27d4 (diff) | |
Fixed #10650 -- Clarified description of MEDIA_ROOT in setting files. Thanks jjconti, tvon, vak, Muhammad Alkarouri and thiggins for their work.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14560 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/conf')
| -rw-r--r-- | django/conf/global_settings.py | 2 | ||||
| -rw-r--r-- | 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 d31e61f88d..fab2d0f6de 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 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 d3e6973d04..07a823b7c5 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/" MEDIA_ROOT = '' |