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:24:02 UTC
incubator-freemarker git commit: Added "All other marks mentioned
..." to trademarks footer.
Repository: incubator-freemarker
Updated Branches:
refs/heads/2.3-gae 68c3d6456 -> dc559a3e5
Added "All other marks mentioned ..." to trademarks footer.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/dc559a3e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/dc559a3e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/dc559a3e
Branch: refs/heads/2.3-gae
Commit: dc559a3e525273e6586aed6bdcdb33a896869354
Parents: 68c3d64
Author: ddekany <dd...@apache.org>
Authored: Sun Nov 12 18:23:56 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sun Nov 12 18:23:56 2017 +0100
----------------------------------------------------------------------
src/manual/en_US/docgen.cjson | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/dc559a3e/src/manual/en_US/docgen.cjson
----------------------------------------------------------------------
diff --git a/src/manual/en_US/docgen.cjson b/src/manual/en_US/docgen.cjson
index 82ce1c0..b2b977e 100644
--- a/src/manual/en_US/docgen.cjson
+++ b/src/manual/en_US/docgen.cjson
@@ -35,7 +35,7 @@ removeNodesWhenOnline: [ "preface" ]
copyrightHolder: "The Apache Software Foundation"
copyrightHolderSite: "https://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
copyrightCommentFile: "docgen-misc/copyrightComment.txt"