summaryrefslogtreecommitdiff
path: root/docs/ref/template-response.txt
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2015-01-26 21:57:10 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2015-02-03 08:29:45 +0100
commit2133f3157eff853329bafb7fda74c3c8fb4eae42 (patch)
tree5bb262ab847c79b3f70d8a8888e267b2816b0373 /docs/ref/template-response.txt
parenta53541852d5601232899e54d66e623bc163c6dc2 (diff)
Fixed #24168 -- Allowed selecting a template engine in a few APIs.
Specifically in rendering shortcuts, template responses, and class-based views that return template responses. Also added a test for render_to_response(status=...) which was missing from fdbfc980. Thanks Tim and Carl for the review.
Diffstat (limited to 'docs/ref/template-response.txt')
-rw-r--r--docs/ref/template-response.txt20
1 files changed, 14 insertions, 6 deletions
diff --git a/docs/ref/template-response.txt b/docs/ref/template-response.txt
index c1ae0267a5..ecf984cdf3 100644
--- a/docs/ref/template-response.txt
+++ b/docs/ref/template-response.txt
@@ -65,7 +65,7 @@ Attributes
Methods
-------
-.. method:: SimpleTemplateResponse.__init__(template, context=None, content_type=None, status=None, charset=None)
+.. method:: SimpleTemplateResponse.__init__(template, context=None, content_type=None, status=None, charset=None, using=None)
Instantiates a :class:`~django.template.response.SimpleTemplateResponse`
object with the given template, context, content type, HTTP status, and
@@ -102,9 +102,13 @@ Methods
be extracted from ``content_type``, and if that is unsuccessful, the
:setting:`DEFAULT_CHARSET` setting will be used.
- .. versionadded:: 1.8
+ ``using``
+ The :setting:`NAME <TEMPLATES-NAME>` of a template engine to use for
+ loading the template.
- The ``charset`` parameter was added.
+ .. versionchanged:: 1.8
+
+ The ``charset`` and ``using`` parameters were added.
.. method:: SimpleTemplateResponse.resolve_context(context)
@@ -185,7 +189,7 @@ TemplateResponse objects
Methods
-------
-.. method:: TemplateResponse.__init__(request, template, context=None, content_type=None, status=None, current_app=None, charset=None)
+.. method:: TemplateResponse.__init__(request, template, context=None, content_type=None, status=None, current_app=None, charset=None, using=None)
Instantiates a :class:`~django.template.response.TemplateResponse` object
with the given request, template, context, content type, HTTP status, and
@@ -235,9 +239,13 @@ Methods
be extracted from ``content_type``, and if that is unsuccessful, the
:setting:`DEFAULT_CHARSET` setting will be used.
- .. versionadded:: 1.8
+ ``using``
+ The :setting:`NAME <TEMPLATES-NAME>` of a template engine to use for
+ loading the template.
+
+ .. versionchanged:: 1.8
- The ``charset`` parameter was added.
+ The ``charset`` and ``using`` parameters were added.
The rendering process
=====================