freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [5/6] incubator-freemarker git commit: (Version history fixes)
Date Fri, 25 Aug 2017 23:38:18 GMT
(Version history fixes)


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

Branch: refs/heads/2.3-gae
Commit: ce4b9e4a0e8d4169a3225fd293afd4692f1554de
Parents: 09821f9
Author: ddekany <ddekany@apache.org>
Authored: Sat Aug 26 00:28:46 2017 +0200
Committer: ddekany <ddekany@apache.org>
Committed: Sat Aug 26 00:28:46 2017 +0200

----------------------------------------------------------------------
 src/manual/en_US/book.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ce4b9e4a/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index 03c42b0..4961955 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -26917,7 +26917,7 @@ TemplateModel x = env.getVariable("x");  // get variable x</programlisting>
               <literal>&amp;&amp;</literal> (logical <quote>and</quote>)
               operator: <literal>\and</literal> and
               <literal>&amp;amp;&amp;amp;</literal>. These are to work
around
-              issues in applications where the template must be a valid XML
+              issues in applications where the template must be valid XML
               (<literal>&amp;&amp;</literal> is not valid XML/HTML, at
most
               places), or where the template entered is stored after XML or
               HTML escaping. Note that lonely <literal>&amp;amp;</literal>,
@@ -26998,9 +26998,8 @@ TemplateModel x = env.getVariable("x");  // get variable x</programlisting>
               <para><literal>Constants.EMPTY_HASH</literal> and
               <literal>GeneralPurposeNothing</literal> (the value of
               <literal>missingVar!</literal>) now implements
-              <literal>TemplateHashModelEx2</literal>, so it can be listed
-              with <literal>&lt;#list ... as k, v&gt;</literal>. Earlier
they
-              were only a <literal>TemplateHashModelEx</literal>-s.</para>
+              <literal>TemplateHashModelEx2</literal>. Earlier they were only
+              a <literal>TemplateHashModelEx</literal>-s.</para>
             </listitem>
 
             <listitem>


Mime
View raw message