From 85149a8b7fb560960fb6e8b64e1d9f486e982c19 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Fri, 17 Jan 2014 15:58:19 -0500 Subject: [1.6.x] Fixed #18942 -- Clarified usage of {% get_static_prefix %}. Thanks Aymeric for the suggestion. Backport of bc7668eb51 from master --- docs/ref/settings.txt | 6 ++---- docs/ref/templates/builtins.txt | 7 +++---- 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'docs/ref') diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 95104afacf..42f2038650 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -2592,9 +2592,7 @@ tuples, e.g.:: ("downloads", "/opt/webfiles/stats"), ) -Example: - -Assuming you have :setting:`STATIC_URL` set ``'/static/'``, the +For example, assuming you have :setting:`STATIC_URL` set to ``'/static/'``, the :djadmin:`collectstatic` management command would collect the "stats" files in a ``'downloads'`` subdirectory of :setting:`STATIC_ROOT`. @@ -2604,7 +2602,7 @@ This would allow you to refer to the local file .. code-block:: html+django - + .. setting:: STATICFILES_STORAGE diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt index 6e773f67c7..6d1ca6b42c 100644 --- a/docs/ref/templates/builtins.txt +++ b/docs/ref/templates/builtins.txt @@ -2456,10 +2456,9 @@ get_static_prefix .. highlight:: html+django -If you're not using :class:`~django.template.RequestContext`, or if you need -more control over exactly where and how :setting:`STATIC_URL` is injected -into the template, you can use the :ttag:`get_static_prefix` template tag -instead:: +You should prefer the :ttag:`static` template tag, but if you need more control +over exactly where and how :setting:`STATIC_URL` is injected into the template, +you can use the :ttag:`get_static_prefix` template tag:: {% load static %} Hi! -- cgit v1.3