Return-Path: <dev-return-173630-archive-asf-public=cust-asf.ponee.io@tomcat.apache.org>
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 B4A5B200AE3
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed,  4 May 2016 10:03:45 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id B32D01609FD; Wed,  4 May 2016 10:03:45 +0200 (CEST)
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 15A241609F1
	for <archive-asf-public@cust-asf.ponee.io>; Wed,  4 May 2016 10:03:44 +0200 (CEST)
Received: (qmail 18384 invoked by uid 500); 4 May 2016 08:03:43 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 18374 invoked by uid 99); 4 May 2016 08:03:43 -0000
Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 May 2016 08:03:43 +0000
Received: from localhost (localhost [127.0.0.1])
	by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 425A21A03DD
	for <dev@tomcat.apache.org>; Wed,  4 May 2016 08:03:43 +0000 (UTC)
X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org
X-Spam-Flag: NO
X-Spam-Score: 1.799
X-Spam-Level: *
X-Spam-Status: No, score=1.799 tagged_above=-999 required=6.31
	tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1,
	RP_MATCHES_RCVD=-0.001] autolearn=disabled
Received: from mx1-lw-eu.apache.org ([10.40.0.8])
	by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024)
	with ESMTP id 5ifQyd709MTp for <dev@tomcat.apache.org>;
	Wed,  4 May 2016 08:03:42 +0000 (UTC)
Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139])
	by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id D24525F36F
	for <dev@tomcat.apache.org>; Wed,  4 May 2016 08:03:41 +0000 (UTC)
Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6])
	by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id C475BE0335
	for <dev@tomcat.apache.org>; Wed,  4 May 2016 08:03:40 +0000 (UTC)
Received: from svn01-us-west.apache.org (localhost [127.0.0.1])
	by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id E54813A05E4
	for <dev@tomcat.apache.org>; Wed,  4 May 2016 08:03:39 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1742225 - in /tomcat/site/trunk: docs/legal.html xdocs/legal.xml
Date: Wed, 04 May 2016 08:03:39 -0000
To: dev@tomcat.apache.org
From: markt@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20160504080339.E54813A05E4@svn01-us-west.apache.org>
archived-at: Wed, 04 May 2016 08:03:45 -0000

Author: markt
Date: Wed May  4 08:03:39 2016
New Revision: 1742225

URL: http://svn.apache.org/viewvc?rev=1742225&view=rev
Log:
Update since Tomcat is now registered

Modified:
    tomcat/site/trunk/docs/legal.html
    tomcat/site/trunk/xdocs/legal.xml

Modified: tomcat/site/trunk/docs/legal.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/legal.html?rev=1742225&r1=1742224&r2=1742225&view=diff
==============================================================================
--- tomcat/site/trunk/docs/legal.html (original)
+++ tomcat/site/trunk/docs/legal.html Wed May  4 08:03:39 2016
@@ -249,10 +249,13 @@ Version 2.0 (current)</a>.
 <h3 id="Trademarks">Trademarks</h3>
 <div class="text">
     
-<p>"Apache Tomcat" and "Tomcat" are trademarks of the Apache Software
+<p>"Tomcat" is a registered trademark of the Apache Software Foundation.
+    "Apache Tomcat" and the Tomcat logo are trademarks of the Apache Software
     Foundation. Use of these trademarks is subject to the terms of section
     6 of <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License,
-    Version 2.0 (current)</a>.</p>
+    Version 2.0 (current)</a> and the
+    <a href="http://www.apache.org/foundation/marks/#guidelines">ASF branding
+    guidelines</a>.</p>
 
     
 <p>If you create a product that uses Apache Tomcat software or provides

Modified: tomcat/site/trunk/xdocs/legal.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/legal.xml?rev=1742225&r1=1742224&r2=1742225&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/legal.xml (original)
+++ tomcat/site/trunk/xdocs/legal.xml Wed May  4 08:03:39 2016
@@ -38,10 +38,13 @@ Version 2.0 (current)</a>.
 
   </section>
   <section name="Trademarks">
-    <p>"Apache Tomcat" and "Tomcat" are trademarks of the Apache Software
+    <p>"Tomcat" is a registered trademark of the Apache Software Foundation.
+    "Apache Tomcat" and the Tomcat logo are trademarks of the Apache Software
     Foundation. Use of these trademarks is subject to the terms of section
     6 of <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License,
-    Version 2.0 (current)</a>.</p>
+    Version 2.0 (current)</a> and the
+    <a href="http://www.apache.org/foundation/marks/#guidelines">ASF branding
+    guidelines</a>.</p>
 
     <p>If you create a product that uses Apache Tomcat software or provides
     additional functionality to that software then:</p>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org