Browse files

[1.2.X] Fixed #10650 -- Clarified description of MEDIA_ROOT in settin…

…g 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
  • Loading branch information...
1 parent a052bcb commit dc3b524f6c0c513425f21434b44f3d9ef2d923c1 @ramiro ramiro committed Nov 14, 2010
Showing with 2 additions and 2 deletions.
  1. +1 −1 django/conf/global_settings.py
  2. +1 −1 django/conf/project_template/settings.py
View
2 django/conf/global_settings.py
@@ -258,7 +258,7 @@
# 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 = ''
View
2 django/conf/project_template/settings.py
@@ -43,7 +43,7 @@
# 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 = ''

0 comments on commit dc3b524

Please sign in to comment.