summaryrefslogtreecommitdiff
path: root/docs/templates_python.txt
diff options
context:
space:
mode:
authorJustin Bronn <jbronn@gmail.com>2008-02-28 21:24:51 +0000
committerJustin Bronn <jbronn@gmail.com>2008-02-28 21:24:51 +0000
commit22e016ff6c18a35a450519b94de63033f83e6b4f (patch)
tree1e58cc40a636b4e4f3dcf429a5a116c015c36278 /docs/templates_python.txt
parent0b52413cc926446f238fd781b4def6804f64d231 (diff)
gis: Merged revisions 7105-7168 via svnmerge from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7176 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/templates_python.txt')
-rw-r--r--docs/templates_python.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/templates_python.txt b/docs/templates_python.txt
index f98cfa3249..c6e9223e9f 100644
--- a/docs/templates_python.txt
+++ b/docs/templates_python.txt
@@ -395,6 +395,8 @@ See the `internationalization docs`_ for more.
django.core.context_processors.media
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+**New in Django development version**
+
If ``TEMPLATE_CONTEXT_PROCESSORS`` contains this processor, every
``RequestContext`` will contain a variable ``MEDIA_URL``, providing the
value of the `MEDIA_URL setting`_.
@@ -1014,7 +1016,7 @@ This is not a very common situation, but it's useful if you're rendering a
template yourself. For example::
def render(self, context):
- t = template.load_template('small_fragment.html')
+ t = template.loader.get_template('small_fragment.html')
return t.render(Context({'var': obj}, autoescape=context.autoescape))
If we had neglected to pass in the current ``context.autoescape`` value to our