Commit dc3b524f authored by Ramiro Morales's avatar Ramiro Morales
Browse files

[1.2.X] Fixed #10650 -- Clarified description of MEDIA_ROOT in setting files.... 

[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
parent a052bcb0

django/conf/global_settings.py

+1 −1
Original line number Diff line number Diff line
@@ -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 = ''

django/conf/project_template/settings.py

+1 −1
Original line number Diff line number Diff line
@@ -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 = ''