Merge branch 'master' of github.com:django/django

2 files changed, 22 insertions, 0 deletions

diff --git a/docs/ref/contrib/staticfiles.txt b/docs/ref/contrib/staticfiles.txt
index 126bcdd4e6..f5557dff91 100644
--- a/docs/ref/contrib/staticfiles.txt
+++ b/docs/ref/contrib/staticfiles.txt
@@ -387,6 +387,17 @@ The previous example is equal to calling the ``url`` method of an instance of
 useful when using a non-local storage backend to deploy files as documented
 in :ref:`staticfiles-from-cdn`.
 
+.. versionadded:: 1.5
+
+If you'd like to retrieve a static URL without displaying it, you can use a
+slightly different call::
+
+.. code-block:: html+django
+
+    {% load static from staticfiles %}
+    {% static "images/hi.jpg" as myphoto %}
+    <img src="{{ myphoto }}" alt="Hi!" />
+
 Other Helpers
 =============
 
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index cf228d72f6..71f57acdbf 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -2354,6 +2354,17 @@ It is also able to consume standard context variables, e.g. assuming a
     {% load static %}
     <link rel="stylesheet" href="{% static user_stylesheet %}" type="text/css" media="screen" />
 
+If you'd like to retrieve a static URL without displaying it, you can use a
+slightly different call::
+
+.. versionadded:: 1.5
+
+.. code-block:: html+django
+
+    {% load static %}
+    {% static "images/hi.jpg" as myphoto %}
+    <img src="{{ myphoto }}"></img>
+
 .. note::
 
     The :mod:`staticfiles<django.contrib.staticfiles>` contrib app also ships