Browse files

Fixed #1349 -- Clarified docs on serving files from STATIC/MEDIA_URL.

  • Loading branch information...
1 parent 7131e14 commit fb7c347f7bd360b567c0b30697a6a200be2d6778 @timgraham timgraham committed May 5, 2014
Showing with 9 additions and 1 deletion.
  1. +3 −0 docs/howto/static-files/index.txt
  2. +6 −1 docs/ref/settings.txt
3 docs/howto/static-files/index.txt
@@ -75,6 +75,7 @@ details on how ``staticfiles`` finds your files.
by putting those static files inside *another* directory named for the
application itself.
+.. _serving-static-files-in-development:
Serving static files during development.
@@ -108,6 +109,8 @@ this by adding the following snippet to your
folder; it doesn't perform static files discovery like
+.. _serving-uploaded-files-in-development:
Serving files uploaded by a user during development.
7 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: ``""``
@@ -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>`.

0 comments on commit fb7c347

Please sign in to comment.