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/01/23 13:03:38 UTC
[1/2] incubator-freemarker-docgen git commit: Log FreeMarker version.
Also increased it to 2.3.35.
Repository: incubator-freemarker-docgen
Updated Branches:
refs/heads/master 58d83ee4d -> 1a6495999
Log FreeMarker version. Also increased it to 2.3.35.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/commit/f99ec0ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/tree/f99ec0ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/diff/f99ec0ba
Branch: refs/heads/master
Commit: f99ec0ba90317456b8f48d6596aacb36f6696291
Parents: 58d83ee
Author: ddekany <dd...@apache.org>
Authored: Mon Jan 23 14:01:56 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Mon Jan 23 14:02:29 2017 +0100
----------------------------------------------------------------------
.classpath | 2 +-
src/main/org/freemarker/docgen/Transform.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/f99ec0ba/.classpath
----------------------------------------------------------------------
diff --git a/.classpath b/.classpath
index a3c6ca7..41463ae 100644
--- a/.classpath
+++ b/.classpath
@@ -8,6 +8,6 @@
<classpathentry kind="lib" path="ide-dependencies/jing-20091111.jar"/>
<classpathentry kind="lib" path="ide-dependencies/saxon-8.7.jar"/>
<classpathentry kind="lib" path="ide-dependencies/xercesImpl-2.9.1.jar"/>
- <classpathentry kind="lib" path="ide-dependencies/freemarker-2.3.25-incubating.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/FreeMarker-2.3-gae"/>
<classpathentry kind="output" path=".bin"/>
</classpath>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/f99ec0ba/src/main/org/freemarker/docgen/Transform.java
----------------------------------------------------------------------
diff --git a/src/main/org/freemarker/docgen/Transform.java b/src/main/org/freemarker/docgen/Transform.java
index c379bf3..3a21f03 100644
--- a/src/main/org/freemarker/docgen/Transform.java
+++ b/src/main/org/freemarker/docgen/Transform.java
@@ -1240,7 +1240,8 @@ public final class Transform {
throw new BugException(e);
}
- fmConfig = new Configuration(Configuration.VERSION_2_3_24);
+ logger.info("Using FreeMarker " + Configuration.getVersion());
+ fmConfig = new Configuration(Configuration.VERSION_2_3_25);
TemplateLoader templateLoader = new ClassTemplateLoader(
Transform.class, "templates");
[2/2] incubator-freemarker-docgen git commit: Remove "mailto:" when
displaying a mailto URL.
Posted by dd...@apache.org.
Remove "mailto:" when displaying a mailto URL.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/commit/1a649599
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/tree/1a649599
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/diff/1a649599
Branch: refs/heads/master
Commit: 1a6495999fddd6036309020e08abc22d333629b5
Parents: f99ec0b
Author: ddekany <dd...@apache.org>
Authored: Mon Jan 23 14:03:25 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Mon Jan 23 14:03:25 2017 +0100
----------------------------------------------------------------------
src/main/org/freemarker/docgen/templates/node-handlers.ftlh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/1a649599/src/main/org/freemarker/docgen/templates/node-handlers.ftlh
----------------------------------------------------------------------
diff --git a/src/main/org/freemarker/docgen/templates/node-handlers.ftlh b/src/main/org/freemarker/docgen/templates/node-handlers.ftlh
index 88803dd..40fedd0 100644
--- a/src/main/org/freemarker/docgen/templates/node-handlers.ftlh
+++ b/src/main/org/freemarker/docgen/templates/node-handlers.ftlh
@@ -233,7 +233,7 @@
+ "\". Ensure this target is defined in the docgen.cfg file.">
</#if>
<#local url = olinks[.node.@targetdoc]>
- <a href="${url}"><#if .node?children?size != 0><#recurse><#else>${url}</#if></a><#t>
+ <a href="${url}"><#if .node?children?size != 0><#recurse>><#else>${url?removeBeginning('mailto:')}</#if></a><#t>
</#macro>
<#macro orderedlist>