diff options
| author | Jannis Leidel <jannis@leidel.info> | 2011-01-02 01:33:11 +0000 |
|---|---|---|
| committer | Jannis Leidel <jannis@leidel.info> | 2011-01-02 01:33:11 +0000 |
| commit | 544ab30ed71e0d78c4c061008758de29ff79e8f7 (patch) | |
| tree | 55c710a12a6552bd461d621e38c0d6fa526f5ef6 /docs/ref/settings.txt | |
| parent | 7a89d3d503cad96689fee3028a218ff5456f73f1 (diff) | |
Fixed #6218 -- Made MEDIA_URL and STATIC_URL require a trailing slash to ensure there is a consistent way to combine paths in templates. Thanks to Michael Toomim, Chris Heisel and Chris Beaven.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15130 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref/settings.txt')
| -rw-r--r-- | docs/ref/settings.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 3b65f1461f..87a71fe6ed 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -1251,10 +1251,8 @@ for :doc:`managing stored files </topics/files>`. Example: ``"http://media.lawrence.com/"`` -Note that this should have a trailing slash if it has a path component. - - * Good: ``"http://www.example.com/media/"`` - * Bad: ``"http://www.example.com/media"`` +.. versionchanged:: 1.3 + It must end in a slash if set to a non-empty value. MESSAGE_LEVEL ------------- @@ -1664,6 +1662,8 @@ If not ``None``, this will be used as the base path for :ref:`media definitions<form-media-paths>` and the :doc:`staticfiles app</ref/contrib/staticfiles>`. +It must end in a slash if set to a non-empty value. + See :setting:`STATIC_ROOT`. .. setting:: TEMPLATE_CONTEXT_PROCESSORS |