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/07/01 18:41:34 UTC
[2/4] incubator-freemarker git commit: Added missing "Apache" before
"FreeMarker" in NOTICE files.
Added missing "Apache" before "FreeMarker" in NOTICE files.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/c7396518
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/c7396518
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/c7396518
Branch: refs/heads/2.3
Commit: c7396518887a2b9a40290427ba17bcca35b49b82
Parents: 3328b49
Author: ddekany <dd...@apache.org>
Authored: Thu Jun 23 01:41:56 2016 +0200
Committer: ddekany <dd...@apache.org>
Committed: Thu Jun 23 01:41:56 2016 +0200
----------------------------------------------------------------------
NOTICE | 16 ++++++++--------
src/dist/bin/NOTICE | 10 +++++-----
src/dist/jar/META-INF/NOTICE | 11 ++++++-----
3 files changed, 19 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/c7396518/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 9015fd9..7af335c 100644
--- a/NOTICE
+++ b/NOTICE
@@ -6,11 +6,11 @@ The Apache Software Foundation (http://www.apache.org/).
=========================================================================
-FreeMarker, both in its source code and binary form (freemarker.jar)
-includes files that were developed outside the FreeMarker project, and
-are licensed by the Apache Software Foundation under the Apache License,
-Version 2.0. This is the same license as the license of FreeMaker. These
-files are:
+Apache FreeMarker, both in its source code and binary form
+(freemarker.jar) includes files that were developed outside the Apache
+FreeMarker project, and are licensed by the Apache Software Foundation
+under the Apache License, Version 2.0. This is the same license as the
+license of Apache FreeMarker. These files are:
src/main/resources/freemarker/ext/jsp/web-app_2_2.dtd
src/main/resources/freemarker/ext/jsp/web-app_2_3.dtd
@@ -19,9 +19,9 @@ files are:
=========================================================================
-The FreeMarker source code contains the following binaries, which were
-produced by the FreeMarker project itself, and are hence covered by the
-license of the FreeMarker project:
+The Apache FreeMarker source code contains the following binaries, which
+were produced by the Apache FreeMarker project itself, and are hence
+covered by the license of the Apache FreeMarker project:
src/main/misc/overloadedNumberRules/prices.ods
src/manual/en_US/docgen-originals/figures/overview.odg
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/c7396518/src/dist/bin/NOTICE
----------------------------------------------------------------------
diff --git a/src/dist/bin/NOTICE b/src/dist/bin/NOTICE
index 918d7dc..54e5f42 100644
--- a/src/dist/bin/NOTICE
+++ b/src/dist/bin/NOTICE
@@ -36,11 +36,11 @@ The name, license, and attribution of each icon sets (fonts) used follows:
===========================================================================
-FreeMarker, both in its source code and binary form (freemarker.jar)
-includes files that were developed outside the FreeMarker project, and
-are licensed by the Apache Software Foundation under the Apache License,
-Version 2.0. This is the same license as the license of FreeMaker. These
-files in the binary distribution are:
+Apache FreeMarker, both in its source code and binary form (freemarker.jar)
+includes files that were developed outside the Apache FreeMarker project,
+and are licensed by the Apache Software Foundation under the Apache
+License, Version 2.0. This is the same license as the license of Apache
+FreeMarker. These files in the binary distribution are:
freemarker.jar/freemarker/ext/jsp/web-app_2_2.dtd
freemarker.jar/freemarker/ext/jsp/web-app_2_3.dtd
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/c7396518/src/dist/jar/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/src/dist/jar/META-INF/NOTICE b/src/dist/jar/META-INF/NOTICE
index 53915b3..5baf4e3 100644
--- a/src/dist/jar/META-INF/NOTICE
+++ b/src/dist/jar/META-INF/NOTICE
@@ -8,11 +8,12 @@ The Apache Software Foundation (http://www.apache.org/).
===========================================================================
-FreeMarker, both in its source code and binary form (freemarker.jar)
-includes files that were developed outside the FreeMarker project, and
-are licensed by the Apache Software Foundation under the Apache License,
-Version 2.0. This is the same license as the license of FreeMaker. These
-files in the FreeMarker binary (inside the jar file) are:
+Apache FreeMarker, both in its source code and binary form (freemarker.jar)
+includes files that were developed outside the Apache FreeMarker project,
+and are licensed by the Apache Software Foundation under the Apache
+License, Version 2.0. This is the same license as the license of Apache
+FreeMarker. These files in the Apache FreeMarker binary (inside the jar
+file) are:
freemarker/ext/jsp/web-app_2_2.dtd
freemarker/ext/jsp/web-app_2_3.dtd