Return-Path: X-Original-To: apmail-freemarker-notifications-archive@minotaur.apache.org Delivered-To: apmail-freemarker-notifications-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 75B0A18A06 for ; Fri, 1 Jan 2016 19:36:03 +0000 (UTC) Received: (qmail 99832 invoked by uid 500); 1 Jan 2016 19:36:03 -0000 Delivered-To: apmail-freemarker-notifications-archive@freemarker.apache.org Received: (qmail 99811 invoked by uid 500); 1 Jan 2016 19:36:03 -0000 Mailing-List: contact notifications-help@freemarker.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@freemarker.incubator.apache.org Delivered-To: mailing list notifications@freemarker.incubator.apache.org Received: (qmail 99802 invoked by uid 99); 1 Jan 2016 19:36:03 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Jan 2016 19:36:03 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 9DC1CC023A for ; Fri, 1 Jan 2016 19:36:02 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.226 X-Spam-Level: * X-Spam-Status: No, score=1.226 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.554] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id P97t92vne8HG for ; Fri, 1 Jan 2016 19:36:01 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 9EC7620246 for ; Fri, 1 Jan 2016 19:36:01 +0000 (UTC) Received: (qmail 99795 invoked by uid 99); 1 Jan 2016 19:36:01 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Jan 2016 19:36:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 366DFDFF93; Fri, 1 Jan 2016 19:36:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ddekany@apache.org To: notifications@freemarker.incubator.apache.org Date: Fri, 01 Jan 2016 19:36:03 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] incubator-freemarker git commit: Added copyright header to Manual output, also fixed copyright in the footer. 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 Authored: Fri Jan 1 20:35:47 2016 +0100 Committer: ddekany 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": {