Author: lukeplant
Date: 2010-09-07 15:54:13 -0500 (Tue, 07 Sep 2010)
New Revision: 13695
Modified:
django/branches/releases/1.2.X/
django/branches/releases/1.2.X/docs/ref/templates/builtins.txt
Log:
[1.2.X] Fixed #13350 - Documentation on autoescape should mention endautoescape
Thanks to mountainp...@gmail.com for report and to dwillis for patch.
Backport of [13694] from trunk
Property changes on: django/branches/releases/1.2.X
___________________________________________________________________
Name: svnmerge-integrated
-
/django/trunk:1-13360,13434,13480,13574,13600,13638,13652,13664,13666,13668,13680,13683,13685,13687-13688,13690
+
/django/trunk:1-13360,13434,13480,13574,13600,13638,13652,13664,13666,13668,13680,13683,13685,13687-13688,13690,13694
Modified: django/branches/releases/1.2.X/docs/ref/templates/builtins.txt
===================================================================
--- django/branches/releases/1.2.X/docs/ref/templates/builtins.txt
2010-09-07 20:49:32 UTC (rev 13694)
+++ django/branches/releases/1.2.X/docs/ref/templates/builtins.txt
2010-09-07 20:54:13 UTC (rev 13695)
@@ -23,7 +23,7 @@
Control the current auto-escaping behavior. This tag takes either ``on`` or
``off`` as an argument and that determines whether auto-escaping is in effect
-inside the block.
+inside the block. The block is closed with an ``endautoescape`` ending tag.
When auto-escaping is in effect, all variable content has HTML escaping applied
to it before placing the result into the output (but after any filters have
@@ -34,6 +34,12 @@
escaping, either by the code that populated the variable, or because it has had
the ``safe`` or ``escape`` filters applied.
+Sample usage::
+
+ {% autoescape on %}
+ {{ body }}
+ {% endautoescape %}
+
.. templatetag:: block
block
--
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.
