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 2017/03/06 15:33:30 UTC
[1/2] incubator-freemarker-site git commit: Removed FMPP link from
the menu
Repository: incubator-freemarker-site
Updated Branches:
refs/heads/master 87c43c691 -> 91ccf7b05
Removed FMPP link from the menu
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/commit/4b8409d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/4b8409d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/4b8409d0
Branch: refs/heads/master
Commit: 4b8409d05ed843a6be35efa1da0dd88f16daa2d0
Parents: 87c43c6
Author: ddekany <dd...@apache.org>
Authored: Mon Mar 6 16:32:42 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Mon Mar 6 16:32:42 2017 +0100
----------------------------------------------------------------------
src/main/docgen/book.xml | 7 -------
src/main/docgen/docgen.cjson | 1 -
2 files changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/4b8409d0/src/main/docgen/book.xml
----------------------------------------------------------------------
diff --git a/src/main/docgen/book.xml b/src/main/docgen/book.xml
index f5d2bb9..71835f8 100644
--- a/src/main/docgen/book.xml
+++ b/src/main/docgen/book.xml
@@ -512,13 +512,6 @@ two freemarker.jar-s and unpredictable behavior!
<para/>
</section>
-
- <section>
- <title><olink targetdoc="fmpp">File generator tool
- (FMPP)</olink></title>
-
- <para/>
- </section>
</chapter>
<chapter>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/4b8409d0/src/main/docgen/docgen.cjson
----------------------------------------------------------------------
diff --git a/src/main/docgen/docgen.cjson b/src/main/docgen/docgen.cjson
index 32f6b65..99a7e62 100644
--- a/src/main/docgen/docgen.cjson
+++ b/src/main/docgen/docgen.cjson
@@ -66,7 +66,6 @@ olinks: {
// External URL-s:
onlineTemplateTester: "http://freemarker-online.kenshoo.com/"
- fmpp: "http://fmpp.sourceforge.net/"
twitter: "https://twitter.com/freemarker"
sourceforgeProject: "https://sourceforge.net/projects/freemarker/"
gitFreemarker: "https://git-wip-us.apache.org/repos/asf/incubator-freemarker.git"
[2/2] incubator-freemarker-site git commit: Mentioned "3" branch,
removed reference to the now obsolete "2.4" branch.
Posted by dd...@apache.org.
Mentioned "3" branch, removed reference to the now obsolete "2.4" branch.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/commit/91ccf7b0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/91ccf7b0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/91ccf7b0
Branch: refs/heads/master
Commit: 91ccf7b050da3b56ef1168a76516d2ab53a8fd7c
Parents: 4b8409d
Author: ddekany <dd...@apache.org>
Authored: Mon Mar 6 16:33:23 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Mon Mar 6 16:33:23 2017 +0100
----------------------------------------------------------------------
src/main/docgen/book.xml | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/91ccf7b0/src/main/docgen/book.xml
----------------------------------------------------------------------
diff --git a/src/main/docgen/book.xml b/src/main/docgen/book.xml
index 71835f8..6b88475 100644
--- a/src/main/docgen/book.xml
+++ b/src/main/docgen/book.xml
@@ -1933,11 +1933,8 @@ two freemarker.jar-s and unpredictable behavior!
</listitem>
<listitem>
- <para><literal>master</literal>: FreeMarker 2.4.x. Had no
- release as of this writing. This is <literal>2.3-gae</literal>
- plus the changes that aren't 100% backward compatible. We only
- commit 2.4-exclusive changes directly here, all other changes
- are coming from <literal>2.3-gae</literal> via merging.</para>
+ <para><literal>3</literal>: FreeMarker 3.x.x. Had no release as
+ of this writing.</para>
</listitem>
</itemizedlist>
</listitem>