You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2016/06/14 18:48:16 UTC
[1/3] incubator-freemarker git commit: Manual: Fixing some typos in
the version history
Repository: incubator-freemarker
Updated Branches:
refs/heads/2.3 716b1f1a1 -> e6b61c6cf
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
Commit: 4f5a76074beb6d6c81585b874aca31d6e3741c79
Parents: 304bb27
Author: ddekany <dd...@apache.org>
Authored: Mon Jun 13 18:54:36 2016 +0200
Committer: ddekany <dd...@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><#list map as k,
v>${k}: ${v}</#list></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,
[2/3] incubator-freemarker git commit: (Manual: Version history
additions)
Posted by dd...@apache.org.
(Manual: Version history additions)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/504ec38d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/504ec38d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/504ec38d
Branch: refs/heads/2.3
Commit: 504ec38d9bad04064645494f448cea51b6c5fb1f
Parents: 4f5a760
Author: ddekany <dd...@apache.org>
Authored: Tue Jun 14 20:46:19 2016 +0200
Committer: ddekany <dd...@apache.org>
Committed: Tue Jun 14 20:46:19 2016 +0200
----------------------------------------------------------------------
src/manual/en_US/book.xml | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/504ec38d/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index 60d21bc..9190e2a 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -26557,7 +26557,7 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
<section xml:id="versions_2_3_25">
<title>2.3.25 (incubating at Apache)</title>
- <para>Release date: 2016-06-14 + voting process (around 2
+ <para>Release date: 2016-06-14 + voting process (usually around 2
weeks)</para>
<para>This is a stable, final release. The <quote>incubating</quote>
@@ -26725,6 +26725,11 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
project with Gradle: <quote>warning: Cannot find annotation
method 'value()' in type 'SuppressFBWarnings'</quote></para>
</listitem>
+
+ <listitem>
+ <para>The Maven source artifact now contains the JavaCC
+ generated java files and <literal>FTL.jj</literal>.</para>
+ </listitem>
</itemizedlist>
</section>
</section>
[3/3] incubator-freemarker git commit: Merge remote-tracking branch
'origin/2.3-gae' into 2.3
Posted by dd...@apache.org.
Merge remote-tracking branch 'origin/2.3-gae' into 2.3
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/e6b61c6c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/e6b61c6c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/e6b61c6c
Branch: refs/heads/2.3
Commit: e6b61c6cfbb2d8ed626b82e25b8f93489f8750fc
Parents: 716b1f1 504ec38
Author: ddekany <dd...@apache.org>
Authored: Tue Jun 14 20:48:01 2016 +0200
Committer: ddekany <dd...@apache.org>
Committed: Tue Jun 14 20:48:01 2016 +0200
----------------------------------------------------------------------
src/manual/en_US/book.xml | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------