Browse files

[1.6.x] Fixed #21154 -- Updated TemplateResponse docs to better expla…

…in context.

Thanks mrmachine for the report.

Backport of c39c9f2 from master
  • Loading branch information...
1 parent 0d74bda commit 98773c4bb53ff464c3782694f244e80158f975ee @funkybob funkybob committed with timgraham Sep 30, 2013
Showing with 7 additions and 5 deletions.
  1. +7 −5 docs/ref/template-response.txt
12 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`.
@@ -162,7 +162,9 @@ Methods
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`.
The HTTP Status code for the response.

0 comments on commit 98773c4

Please sign in to comment.