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/01/01 20:36:01 UTC
[1/3] incubator-freemarker git commit: Added copyright comment to the
TLD-s inside the test jar-s
Repository: incubator-freemarker
Updated Branches:
refs/heads/2.3-gae c52561aaa -> f310e855b
Added copyright comment to the TLD-s inside the test jar-s
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/48f7b87c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/48f7b87c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/48f7b87c
Branch: refs/heads/2.3-gae
Commit: 48f7b87c046f2044c1e3ff170727b9600a12051b
Parents: c52561a
Author: ddekany <dd...@apache.org>
Authored: Fri Jan 1 14:42:39 2016 +0100
Committer: ddekany <dd...@apache.org>
Committed: Fri Jan 1 14:42:39 2016 +0100
----------------------------------------------------------------------
.../jsp/webapps/tldDiscovery/WEB-INF/taglib 2.jar | Bin 752 -> 1179 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/48f7b87c/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/taglib 2.jar
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/taglib 2.jar b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/taglib 2.jar
index 1d067f6..a915da1 100644
Binary files a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/taglib 2.jar and b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/taglib 2.jar differ
[2/3] incubator-freemarker git commit: (JavaDoc adjustment)
Posted by dd...@apache.org.
(JavaDoc adjustment)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/22e5fddf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/22e5fddf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/22e5fddf
Branch: refs/heads/2.3-gae
Commit: 22e5fddfc39a064454d219702328d8c9d9ed9724
Parents: 48f7b87
Author: ddekany <dd...@apache.org>
Authored: Fri Jan 1 20:34:44 2016 +0100
Committer: ddekany <dd...@apache.org>
Committed: Fri Jan 1 20:34:44 2016 +0100
----------------------------------------------------------------------
src/main/java/freemarker/template/utility/StringUtil.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/22e5fddf/src/main/java/freemarker/template/utility/StringUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/StringUtil.java b/src/main/java/freemarker/template/utility/StringUtil.java
index 973c1f4..58d5ffb 100644
--- a/src/main/java/freemarker/template/utility/StringUtil.java
+++ b/src/main/java/freemarker/template/utility/StringUtil.java
@@ -823,7 +823,7 @@ public class StringUtil {
}
/**
- * Removes the line-break from the end of the string.
+ * Removes a line-break from the end of the string (if there's any).
*/
public static String chomp(String s) {
if (s.endsWith("\r\n")) return s.substring(0, s.length() - 2);
[3/3] incubator-freemarker git commit: Added copyright header to
Manual output, also fixed copyright in the footer.
Posted by dd...@apache.org.
Added copyright header to Manual output, also fixed copyright in the 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/f310e855
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/f310e855
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/f310e855
Branch: refs/heads/2.3-gae
Commit: f310e855bb0d291e7181fba26baba7e3be3b5a94
Parents: 22e5fdd
Author: ddekany <dd...@apache.org>
Authored: Fri Jan 1 20:35:47 2016 +0100
Committer: ddekany <dd...@apache.org>
Committed: Fri Jan 1 20:35:47 2016 +0100
----------------------------------------------------------------------
src/manual/en_US/docgen-misc/copyrightComment.txt | 16 ++++++++++++++++
src/manual/en_US/docgen.cjson | 3 ++-
2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f310e855/src/manual/en_US/docgen-misc/copyrightComment.txt
----------------------------------------------------------------------
diff --git a/src/manual/en_US/docgen-misc/copyrightComment.txt b/src/manual/en_US/docgen-misc/copyrightComment.txt
new file mode 100644
index 0000000..60b675e
--- /dev/null
+++ b/src/manual/en_US/docgen-misc/copyrightComment.txt
@@ -0,0 +1,16 @@
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f310e855/src/manual/en_US/docgen.cjson
----------------------------------------------------------------------
diff --git a/src/manual/en_US/docgen.cjson b/src/manual/en_US/docgen.cjson
index 786ec8c..424f703 100644
--- a/src/manual/en_US/docgen.cjson
+++ b/src/manual/en_US/docgen.cjson
@@ -33,8 +33,9 @@ generateEclipseTOC
removeNodesWhenOnline: [ "preface" ]
-copyrightHolder: "The FreeMarker Project"
+copyrightHolder: "The Apache Software Foundation"
copyrightStartYear: 1999
+copyrightCommentFile: "docgen-misc/copyrightComment.txt"
seoMeta: {
"dgui_quickstart": {