freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject incubator-freemarker git commit: Manual: Fixing some typos in the version history
Date Mon, 13 Jun 2016 17:52:19 GMT
Repository: incubator-freemarker
Updated Branches:
  refs/heads/2.3-gae 304bb272d -> 4f5a76074


Manual: Fixing some typos in the version history


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

Branch: refs/heads/2.3-gae
Commit: 4f5a76074beb6d6c81585b874aca31d6e3741c79
Parents: 304bb27
Author: ddekany <ddekany@apache.org>
Authored: Mon Jun 13 18:54:36 2016 +0200
Committer: ddekany <ddekany@apache.org>
Committed: Mon Jun 13 18:54:36 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4f5a7607/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index 8df0004..60d21bc 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -26574,7 +26574,7 @@ TemplateModel x = env.getVariable("x");  // get variable x</programlisting>
               directive</link> to support listing hashes (such as
               <literal>Map</literal>-s), like <literal>&lt;#list map
as k,
               v&gt;${k}: ${v}&lt;/#list&gt;</literal>, where
-              <literal>k</literal> and <literal>v</literal> is the
key and
+              <literal>k</literal> and <literal>v</literal> are the
key and
               value in the key-value pairs of the hash.</para>
             </listitem>
           </itemizedlist>
@@ -26685,7 +26685,7 @@ TemplateModel x = env.getVariable("x");  // get variable x</programlisting>
               xlink:href="https://issues.apache.org/jira/browse/FREEMARKER-19">FREEMARKER-19</link>):
               The column numbers calculated by the parser has assumed tab size
               1 since 2.3.25 (an unwanted side effect of updating JavaCC),
-              while before it has assume tab size 8. The default was restored
+              while before it has assumed tab size 8. The default was restored
               to 8. This bug has affected the column numbers in error
               messages. It also broke the output of some rarely used AIP-s,
               namely <literal>Template.getSource(beginCol, beginLine, endCol,


Mime
View raw message