From 2a2d7db01f0032c9dbf446757c121fa2a5904a45 Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Mon, 5 May 2014 07:36:53 -0400
Subject: [1.7.x] Fixed #1349 -- Clarified docs on serving files from
 STATIC/MEDIA_URL.

Backport of fb7c347f7b from master
---
 docs/ref/settings.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'docs/ref')

diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 21d61440d4..2833160c31 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1723,7 +1723,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/"``
 
@@ -2851,6 +2852,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
-- 
cgit v1.3