summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTimo Graham <timograham@gmail.com>2010-12-04 20:20:54 +0000
committerTimo Graham <timograham@gmail.com>2010-12-04 20:20:54 +0000
commit76c2c30daf15c36de4d08040a4f37e35959c0a88 (patch)
tree53b85dc5ad8e9b5430694f5a0cf3770a1d35b954 /docs
parent23f69af45409a29146f215058974898baa7e2207 (diff)
Fixed #14811 - Add clarifying note to render_to_response - thanks adamv.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14814 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/topics/http/shortcuts.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/topics/http/shortcuts.txt b/docs/topics/http/shortcuts.txt
index 6bd3058941..851e63b4fa 100644
--- a/docs/topics/http/shortcuts.txt
+++ b/docs/topics/http/shortcuts.txt
@@ -24,7 +24,10 @@ Required arguments
------------------
``template``
- The full name of a template to use or sequence of template names.
+ The full name of a template to use or sequence of template names. If a
+ sequence is given, the first template that exists will be used. See the
+ :ref:`template loader documentation <ref-templates-api-the-python-api>`
+ for more information on how templates are found.
Optional arguments
------------------
@@ -47,9 +50,6 @@ Optional arguments
context_instance=RequestContext(request))
``mimetype``
-
- .. versionadded:: 1.0
-
The MIME type to use for the resulting document. Defaults to the value of
the :setting:`DEFAULT_CONTENT_TYPE` setting.