diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2005-11-06 23:16:24 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2005-11-06 23:16:24 +0000 |
| commit | 5defabca111fd56011395e81cf250c3c58143589 (patch) | |
| tree | a561ac35cad5a755c75da196fb68272f0c4067ac | |
| parent | af4bef19add46f4673ac4c648c8805808ed65eec (diff) | |
Reordered MEDIA_ROOT and MEDIA_URL in global_settings so they're not in the COMMENTS section
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1109 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/conf/global_settings.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index 6a181ba40e..b8d4d06e58 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -146,6 +146,14 @@ SECRET_KEY = '' # Path to the "jing" executable -- needed to validate XMLFields JING_PATH = "/usr/bin/jing" +# Absolute path to the directory that holds media. +# Example: "/home/media/media.lawrence.com/" +MEDIA_ROOT = '' + +# URL that handles the media served from MEDIA_ROOT. +# Example: "http://media.lawrence.com" +MEDIA_URL = '' + ############## # MIDDLEWARE # ############## @@ -203,11 +211,3 @@ COMMENTS_FIRST_FEW = 0 # A tuple of IP addresses that have been banned from participating in various # Django-powered features. BANNED_IPS = () - -# Absolute path to the directory that holds media. -# Example: "/home/media/media.lawrence.com/" -MEDIA_ROOT = '' - -# URL that handles the media served from MEDIA_ROOT. -# Example: "http://media.lawrence.com" -MEDIA_URL = '' |