summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-05-05 07:36:53 -0400
committerTim Graham <timograham@gmail.com>2014-05-05 07:36:53 -0400
commitfb7c347f7bd360b567c0b30697a6a200be2d6778 (patch)
tree307903dddd540fee1992205737ba6a30ff766c16 /docs/ref
parent7131e14d00b9b293cec4608925f2be6f94474350 (diff)
Fixed #1349 -- Clarified docs on serving files from STATIC/MEDIA_URL.
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/settings.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 9a0dbd686d..ff0feda2fc 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1693,7 +1693,8 @@ Default: ``''`` (Empty string)
URL that handles the media served from :setting:`MEDIA_ROOT`, used
for :doc:`managing stored files </topics/files>`. It must end in a slash if set
-to a non-empty value.
+to a non-empty value. You will need to :ref:`configure these files to be served
+<serving-uploaded-files-in-development>` in both development and production.
Example: ``"http://media.example.com/"``
@@ -2721,6 +2722,10 @@ If not ``None``, this will be used as the base path for
It must end in a slash if set to a non-empty value.
+You may need to :ref:`configure these files to be served in development
+<serving-static-files-in-development>` and will definitely need to do so
+:doc:`in production </howto/static-files/deployment>`.
+
.. setting:: STATICFILES_DIRS
STATICFILES_DIRS