summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorCurtis Maloney <curtis@tinbrain.net>2013-09-30 20:44:41 +1000
committerTim Graham <timograham@gmail.com>2013-09-30 10:21:34 -0400
commit98773c4bb53ff464c3782694f244e80158f975ee (patch)
treed365c1aa903bf00ddae4ee11e7cf007e3fc896f3 /docs/ref
parent0d74bdaf0c39feb8ec303dbbdbcadba70e46eecb (diff)
[1.6.x] Fixed #21154 -- Updated TemplateResponse docs to better explain context.
Thanks mrmachine for the report. Backport of c39c9f2ad8 from master
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/template-response.txt12
1 files changed, 7 insertions, 5 deletions
diff --git a/docs/ref/template-response.txt b/docs/ref/template-response.txt
index 4f34d150ed..6bd528456b 100644
--- a/docs/ref/template-response.txt
+++ b/docs/ref/template-response.txt
@@ -139,10 +139,10 @@ TemplateResponse objects
.. class:: TemplateResponse()
- TemplateResponse is a subclass of
- :class:`~django.template.response.SimpleTemplateResponse` that uses
- a :class:`~django.template.RequestContext` instead of
- a :class:`~django.template.Context`.
+ ``TemplateResponse`` is a subclass of
+ :class:`~django.template.response.SimpleTemplateResponse` that uses
+ a :class:`~django.template.RequestContext` instead of
+ a :class:`~django.template.Context`.
Methods
-------
@@ -162,7 +162,9 @@ Methods
``context``
A dictionary of values to add to the template context. By default,
this is an empty dictionary. :class:`~django.template.Context` objects
- are also accepted as ``context`` values.
+ are also accepted as ``context`` values. If you pass a
+ :class:`~django.template.Context` instance or subclass, it will be used
+ instead of creating a new :class:`~django.template.RequestContext`.
``status``
The HTTP Status code for the response.