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/11/12 17:22:58 UTC
[1/2] incubator-freemarker-site git commit: Added "TM" after Apache
FreeMarker on the opening page
Repository: incubator-freemarker-site
Updated Branches:
refs/heads/master 022056e2a -> 307281e0a
Added "TM" after Apache FreeMarker on the opening page
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/d0d2f959
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/d0d2f959
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/d0d2f959
Branch: refs/heads/master
Commit: d0d2f95916fd56a1772f268491ccd64ef6dbef36
Parents: 022056e
Author: ddekany <dd...@apache.org>
Authored: Sun Nov 12 18:22:00 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sun Nov 12 18:22:00 2017 +0100
----------------------------------------------------------------------
src/main/docgen/book.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/d0d2f959/src/main/docgen/book.xml
----------------------------------------------------------------------
diff --git a/src/main/docgen/book.xml b/src/main/docgen/book.xml
index dd477dc..4afbde3 100644
--- a/src/main/docgen/book.xml
+++ b/src/main/docgen/book.xml
@@ -24,12 +24,12 @@
xmlns:m="http://www.w3.org/1998/Math/MathML"
xmlns:html="http://www.w3.org/1999/xhtml"
xmlns:db="http://docbook.org/ns/docbook">
- <title>Apache FreeMarker</title>
+ <title>Apache FreeMarker™</title>
<chapter role="index.html" xml:id="what-is-freemarker">
- <title>What is Apache FreeMarker?</title>
+ <title>What is Apache FreeMarker™?</title>
- <para>Apache FreeMarker is a <emphasis>template engine</emphasis>: a Java
+ <para>Apache FreeMarker™ is a <emphasis>template engine</emphasis>: a Java
library to generate text output (HTML web pages, e-mails, configuration
files, source code, etc.) based on templates and changing data. Templates
are written in the FreeMarker Template Language (FTL), which is a simple,
[2/2] incubator-freemarker-site git commit: Added "All other marks
mentioned ..." to trademarks footer.
Posted by dd...@apache.org.
Added "All other marks mentioned ..." to trademarks footer.
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/307281e0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/307281e0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/307281e0
Branch: refs/heads/master
Commit: 307281e0ab34e0c260dc874fdeb8a9d58ee99876
Parents: d0d2f95
Author: ddekany <dd...@apache.org>
Authored: Sun Nov 12 18:22:48 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sun Nov 12 18:22:48 2017 +0100
----------------------------------------------------------------------
src/main/docgen/docgen.cjson | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/307281e0/src/main/docgen/docgen.cjson
----------------------------------------------------------------------
diff --git a/src/main/docgen/docgen.cjson b/src/main/docgen/docgen.cjson
index 1c98942..5c6bbef 100644
--- a/src/main/docgen/docgen.cjson
+++ b/src/main/docgen/docgen.cjson
@@ -30,7 +30,7 @@ showXXELogo
copyrightHolder: "The Apache Software Foundation"
copyrightHolderSite: "http://apache.org/"
-copyrightSuffix: "Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation."
+copyrightSuffix: "Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners."
copyrightStartYear: 1999
seoMeta: {