freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [3/3] incubator-freemarker git commit: Added copyright header to Manual output, also fixed copyright in the footer.
Date Fri, 01 Jan 2016 19:36:03 GMT
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 <ddekany@apache.org>
Authored: Fri Jan 1 20:35:47 2016 +0100
Committer: ddekany <ddekany@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": {


Mime
View raw message