From a62b640f7d3a0b90c4009cc7efe0a19fd3ad0bfa Mon Sep 17 00:00:00 2001 From: Loic Bistuer Date: Sun, 1 Sep 2013 11:04:32 +0700 Subject: [1.6.x] Fixed #20973 -- Document serving static files without django.contrib.staticfiles Backport of 7b04038a7f from master --- docs/ref/settings.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'docs/ref') diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index e47e8708b0..b40b5389d3 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -1411,6 +1411,14 @@ Example: ``"/var/www/example.com/media/"`` See also :setting:`MEDIA_URL`. +.. warning:: + + :setting:`MEDIA_ROOT` and :setting:`STATIC_ROOT` must have different + values. Before :setting:`STATIC_ROOT` was introduced, it was common to + rely or fallback on :setting:`MEDIA_ROOT` to also serve static files; + however, since this can have serious security implications, there is a + validation check to prevent it. + .. setting:: MEDIA_URL MEDIA_URL @@ -1424,6 +1432,11 @@ to a non-empty value. Example: ``"http://media.example.com/"`` +.. warning:: + + :setting:`MEDIA_URL` and :setting:`STATIC_URL` must have different + values. See :setting:`MEDIA_ROOT` for more details. + .. setting:: MIDDLEWARE_CLASSES MIDDLEWARE_CLASSES -- cgit v1.3