Repository: incubator-freemarker
Updated Branches:
  refs/heads/2.3-gae 355a09a21 -> afccb1040


Updated JSP-FreeMarker comparison in FAQ


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/afccb104
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/afccb104
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/afccb104

Branch: refs/heads/2.3-gae
Commit: afccb1040306ab7d8dd9d5355134ecd7f066c4eb
Parents: 355a09a
Author: ddekany <ddek...@apache.org>
Authored: Tue Mar 20 08:11:58 2018 +0100
Committer: ddekany <ddek...@apache.org>
Committed: Tue Mar 20 08:11:58 2018 +0100

----------------------------------------------------------------------
 src/manual/en_US/book.xml | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/afccb104/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index f06b759..349319c 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -26165,6 +26165,25 @@ End book</programlisting>
               </listitem>
 
               <listitem>
+                <para><link linkend="dgui_misc_autoescaping">Auto-escaping
+                option</link> to escape HTML and XML special characters
+                printed with
+                <literal>${<replaceable>...</replaceable>}</literal>. So you
+                can just write <literal>${x}</literal> instead of
+                <literal>&lt;c:out value="${x}"/&gt;</literal>, and most
+                importantly, you can't accidentally forget to do
+                escaping.</para>
+              </listitem>
+
+              <listitem>
+                <para>Locale-sensitive number and date formatting by default.
+                When you output for a human audience, all you need to do is
+                just write <literal>${x}</literal> rather than
+                <literal>&lt;fmt:formatNumber value="${x}"
+                /&gt;</literal>.</para>
+              </listitem>
+
+              <listitem>
                 <para>No servlet specific scopes and other highly technical
                 things in templates (unless, of course, you expose them into
                 the data-model deliberately). It was made for MVC from the
@@ -26177,14 +26196,6 @@ End book</programlisting>
               </listitem>
 
               <listitem>
-                <para>Locale-sensitive number and date formatting by default.
-                When you output for a human audience, all you need to do is
-                just write <literal>${x}</literal> rather than
-                <literal>&lt;fmt:formatNumber value="${x}"
-                /&gt;</literal>.</para>
-              </listitem>
-
-              <listitem>
                 <para>Easier to define ad-hoc macros and functions.</para>
               </listitem>
 

Reply via email to