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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
