diff options
| author | Tim Graham <timograham@gmail.com> | 2014-05-05 07:36:53 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-05-05 07:39:08 -0400 |
| commit | 5783088eecddd935be3c641437748040669f91c0 (patch) | |
| tree | e4a5d0f5665efca1d18b680a3c7d47f8e2c23eeb | |
| parent | cddbaca6976a1e6faba8e846b87e27b35e268198 (diff) | |
[1.6.x] Fixed #1349 -- Clarified docs on serving files from STATIC/MEDIA_URL.
Backport of fb7c347f7b from master
| -rw-r--r-- | docs/howto/static-files/index.txt | 3 | ||||
| -rw-r--r-- | docs/ref/settings.txt | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/docs/howto/static-files/index.txt b/docs/howto/static-files/index.txt index 499c9fad38..0f73335c27 100644 --- a/docs/howto/static-files/index.txt +++ b/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. ==================================================== diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 260eada1ee..3740da6618 100644 --- a/docs/ref/settings.txt +++ b/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 |