Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C6485200D38 for ; Sun, 12 Nov 2017 18:23:03 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id C4EE1160BF1; Sun, 12 Nov 2017 17:23:03 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 17033160BCB for ; Sun, 12 Nov 2017 18:23:02 +0100 (CET) Received: (qmail 38262 invoked by uid 500); 12 Nov 2017 17:23:02 -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 38253 invoked by uid 99); 12 Nov 2017 17:23:02 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 12 Nov 2017 17:23:02 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 98E501830EA for ; Sun, 12 Nov 2017 17:23:01 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.222 X-Spam-Level: X-Spam-Status: No, score=-4.222 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id bkL5_mnftaGL for ; Sun, 12 Nov 2017 17:23:00 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id E3F675FBB0 for ; Sun, 12 Nov 2017 17:22:59 +0000 (UTC) Received: (qmail 38159 invoked by uid 99); 12 Nov 2017 17:22:59 -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; Sun, 12 Nov 2017 17:22:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4CEA8DFF40; Sun, 12 Nov 2017 17:22:58 +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: Sun, 12 Nov 2017 17:22:59 -0000 Message-Id: <2da2e7639c2648ce805fddfdb8bdf337@git.apache.org> In-Reply-To: <212b4ba6380f49698c5b5ae316e00452@git.apache.org> References: <212b4ba6380f49698c5b5ae316e00452@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] incubator-freemarker-site git commit: Added "All other marks mentioned ..." to trademarks footer. archived-at: Sun, 12 Nov 2017 17:23:04 -0000 Added "All other marks mentioned ..." to trademarks footer. Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/commit/307281e0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/307281e0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/307281e0 Branch: refs/heads/master Commit: 307281e0ab34e0c260dc874fdeb8a9d58ee99876 Parents: d0d2f95 Author: ddekany Authored: Sun Nov 12 18:22:48 2017 +0100 Committer: ddekany Committed: Sun Nov 12 18:22:48 2017 +0100 ---------------------------------------------------------------------- src/main/docgen/docgen.cjson | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/307281e0/src/main/docgen/docgen.cjson ---------------------------------------------------------------------- diff --git a/src/main/docgen/docgen.cjson b/src/main/docgen/docgen.cjson index 1c98942..5c6bbef 100644 --- a/src/main/docgen/docgen.cjson +++ b/src/main/docgen/docgen.cjson @@ -30,7 +30,7 @@ showXXELogo copyrightHolder: "The Apache Software Foundation" copyrightHolderSite: "http://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 seoMeta: {