Author: ramiro Date: 2010-11-14 09:50:01 -0600 (Sun, 14 Nov 2010) New Revision: 14561
Modified: django/branches/releases/1.2.X/django/conf/global_settings.py django/branches/releases/1.2.X/django/conf/project_template/settings.py Log: [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 Modified: django/branches/releases/1.2.X/django/conf/global_settings.py =================================================================== --- django/branches/releases/1.2.X/django/conf/global_settings.py 2010-11-14 15:42:54 UTC (rev 14560) +++ django/branches/releases/1.2.X/django/conf/global_settings.py 2010-11-14 15:50:01 UTC (rev 14561) @@ -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 = '' Modified: django/branches/releases/1.2.X/django/conf/project_template/settings.py =================================================================== --- django/branches/releases/1.2.X/django/conf/project_template/settings.py 2010-11-14 15:42:54 UTC (rev 14560) +++ django/branches/releases/1.2.X/django/conf/project_template/settings.py 2010-11-14 15:50:01 UTC (rev 14561) @@ -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 = '' -- You received this message because you are subscribed to the Google Groups "Django updates" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/django-updates?hl=en.
