Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.6.x] Fixed #1349 -- Clarified docs on serving files from STATIC/ME…

…DIA_URL.

Backport of fb7c347 from master
  • Loading branch information...
commit 5783088eecddd935be3c641437748040669f91c0 1 parent cddbaca
@timgraham timgraham authored
Showing with 9 additions and 1 deletion.
  1. +3 −0  docs/howto/static-files/index.txt
  2. +6 −1 docs/ref/settings.txt
View
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 urls.py::
folder; it doesn't perform static files discovery like
:mod:`django.contrib.staticfiles`.
+.. _serving-uploaded-files-in-development:
+
Serving files uploaded by a user during development.
====================================================
View
7 docs/ref/settings.txt
@@ -1437,7 +1437,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/"``
@@ -2567,6 +2568,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
Please sign in to comment.
Something went wrong with that request. Please try again.