Author: timo
Date: 2010-12-04 14:21:49 -0600 (Sat, 04 Dec 2010)
New Revision: 14815

Modified:
   django/branches/releases/1.2.X/docs/topics/http/shortcuts.txt
Log:
[1.2.X] Fixed #14811 - Add clarifying note to render_to_response - thanks adamv.

Backport of r14814 from trunk.

Modified: django/branches/releases/1.2.X/docs/topics/http/shortcuts.txt
===================================================================
--- django/branches/releases/1.2.X/docs/topics/http/shortcuts.txt       
2010-12-04 20:20:54 UTC (rev 14814)
+++ django/branches/releases/1.2.X/docs/topics/http/shortcuts.txt       
2010-12-04 20:21:49 UTC (rev 14815)
@@ -24,7 +24,10 @@
 ------------------
 
 ``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 @@
                                   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.
 

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to 
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.

Reply via email to