From bc7668eb515b8ee7a32fbfb64dc4dff4d06abb5b Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Fri, 17 Jan 2014 15:58:19 -0500
Subject: [PATCH] Fixed #18942 -- Clarified usage of {% get_static_prefix %}.

Thanks Aymeric for the suggestion.
---
 docs/ref/settings.txt           | 6 ++----
 docs/ref/templates/builtins.txt | 7 +++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 4181d152ef..e7ee4013c2 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -2628,9 +2628,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`.
 
@@ -2640,7 +2638,7 @@ This would allow you to refer to the local file
 
 .. code-block:: html+django
 
-    <a href="{{ STATIC_URL }}downloads/polls_20101022.tar.gz">
+    <a href="{% static "downloads/polls_20101022.tar.gz" %}">
 
 .. setting:: STATICFILES_STORAGE
 
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index ecd39f1adc..31f6379b0d 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -2501,10 +2501,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 %}
     <img src="{% get_static_prefix %}images/hi.jpg" alt="Hi!" />