Author: markt
Date: Thu Jun 2 08:00:13 2011
New Revision: 1130430
URL: http://svn.apache.org/viewvc?rev=1130430&view=rev
Log:
"... for Tomcat" is no longer permitted as a product name (as per guidelines
from trademarks@)
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=1130430&r1=1130429&r2=1130430&view=diff
==============================================================================
--- tomcat/site/trunk/docs/legal.html (original)
+++ tomcat/site/trunk/docs/legal.html Thu Jun 2 08:00:13 2011
@@ -286,8 +286,7 @@ Version 2.0 (current)</a>.
<p>
<blockquote>
<p>"Apache Tomcat" and "Tomcat" are trademarks of the Apache Software
- Foundation.
- Use of these trademarks is subject to the terms of section
+ 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>
@@ -295,19 +294,17 @@ Version 2.0 (current)</a>.
additional functionality to that software then:
<ul>
<li>When referring to Apache Tomcat software, please use the full name
- of "Apache
- Tomcat" for at least the first reference on any web page,
- help file or similar. Subsequent references may
- refer to "Tomcat".
+ of "Apache Tomcat" for at least the first reference on any web
page,
+ help file or similar. Subsequent references may refer to "Tomcat".
</li>
<li>You may use the <a href="images/tomcat-power.gif">Powered by Tomcat
logo</a>.</li>
<li>You may not use the <a href="images/tomcat.gif">Tomcat logo</a>
without the permission of the Apache Tomcat PMC.</li>
<li>If you use the words "Tomcat" or "Apache" in your product name then
- you must call your product "... for Apache Tomcat" or
- "... for Tomcat". No other form of product name that includes
- "Tomcat" or "Apache" is permitted.</li>
+ you must call your product "... for Apache Tomcat". No other
+ form of product name that includes "Tomcat" or "Apache" is
+ permitted.</li>
</ul>
</p> </blockquote>
</p>
Modified: tomcat/site/trunk/xdocs/legal.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/legal.xml?rev=1130430&r1=1130429&r2=1130430&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/legal.xml (original)
+++ tomcat/site/trunk/xdocs/legal.xml Thu Jun 2 08:00:13 2011
@@ -39,8 +39,7 @@ Version 2.0 (current)</a>.
</section>
<section name="Trademarks">
<p>"Apache Tomcat" and "Tomcat" are trademarks of the Apache Software
- Foundation.
- Use of these trademarks is subject to the terms of section
+ 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>
@@ -48,19 +47,17 @@ Version 2.0 (current)</a>.
additional functionality to that software then:
<ul>
<li>When referring to Apache Tomcat software, please use the full name
- of "Apache
- Tomcat" for at least the first reference on any web page,
- help file or similar. Subsequent references may
- refer to "Tomcat".
+ of "Apache Tomcat" for at least the first reference on any web
page,
+ help file or similar. Subsequent references may refer to "Tomcat".
</li>
<li>You may use the <a href="images/tomcat-power.gif">Powered by Tomcat
logo</a>.</li>
<li>You may not use the <a href="images/tomcat.gif">Tomcat logo</a>
without the permission of the Apache Tomcat PMC.</li>
<li>If you use the words "Tomcat" or "Apache" in your product name then
- you must call your product "... for Apache Tomcat" or
- "... for Tomcat". No other form of product name that includes
- "Tomcat" or "Apache" is permitted.</li>
+ you must call your product "... for Apache Tomcat". No other
+ form of product name that includes "Tomcat" or "Apache" is
+ permitted.</li>
</ul>
</p> </section>
</body>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
