Author: markt
Date: Mon Sep 4 16:40:46 2006
New Revision: 440204
URL: http://svn.apache.org/viewvc?view=rev&rev=440204
Log:
Add trademark guidance to legal page. Note text has been cleared by the
internal legal discussion list.
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?view=diff&rev=440204&r1=440203&r2=440204
==============================================================================
--- tomcat/site/trunk/docs/legal.html (original)
+++ tomcat/site/trunk/docs/legal.html Mon Sep 4 16:40:46 2006
@@ -3,18 +3,18 @@
<html>
<head>
<title>Apache Tomcat - Apache Tomcat -- Legal Stuff They Make Us Say</title>
-<meta value="Apache Tomcat Project" name="author" />
-<meta value="" name="email" />
-<link rel="stylesheet" href="stylesheets/tomcat.css" type="text/css" />
+<meta name="author" value="Apache Tomcat Project"/>
+<meta name="email" value=""/>
+<link type="text/css" href="stylesheets/tomcat.css" rel="stylesheet"/>
</head>
-<body vlink="#525D76" alink="#525D76" link="#525D76" text="#000000"
bgcolor="#ffffff">
-<table cellspacing="0" width="100%" border="0">
+<body bgcolor="#ffffff" text="#000000" link="#525D76" alink="#525D76"
vlink="#525D76">
+<table border="0" width="100%" cellspacing="0">
<!--PAGE HEADER-->
<tr>
<td>
<!--PROJECT LOGO-->
<a href="http://tomcat.apache.org/";>
-<img border="0" alt="Tomcat Logo" align="left" src="./images/tomcat.gif" />
+<img src="./images/tomcat.gif" align="left" alt="Tomcat Logo" border="0"/>
</a>
</td>
<td>
@@ -25,28 +25,28 @@
<td>
<!--APACHE LOGO-->
<a href="http://www.apache.org/";>
-<img border="0" alt="Apache Logo" align="right"
src="http://www.apache.org/images/asf-logo.gif"; />
+<img src="http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache
Logo" border="0"/>
</a>
</td>
</tr>
</table>
<div class="searchbox">
-<form method="get" action="http://www.google.com/search";>
-<input type="hidden" name="sitesearch" value="tomcat.apache.org" />
-<input type="text" id="query" name="q" size="25" value="Search the Site" />
-<input type="submit" value="Search Site" name="Search" />
+<form action="http://www.google.com/search"; method="get">
+<input value="tomcat.apache.org" name="sitesearch" type="hidden"/>
+<input value="Search the Site" size="25" name="q" id="query" type="text"/>
+<input name="Search" value="Search Site" type="submit"/>
</form>
</div>
-<table cellspacing="4" width="100%" border="0">
+<table border="0" width="100%" cellspacing="4">
<!--HEADER SEPARATOR-->
<tr>
<td colspan="2">
-<hr size="1" noshade="" />
+<hr noshade="" size="1"/>
</td>
</tr>
<tr>
<!--LEFT SIDE NAVIGATION-->
-<td nowrap="true" valign="top" width="20%">
+<td width="20%" valign="top" nowrap="true">
<p>
<strong>Apache Tomcat</strong>
</p>
@@ -157,11 +157,11 @@
</ul>
</td>
<!--RIGHT SIDE MAIN BODY-->
-<td align="left" valign="top" width="80%">
-<table width="100%" cellpadding="2" cellspacing="0" border="0">
+<td width="80%" valign="top" align="left">
+<table border="0" cellspacing="0" cellpadding="2" width="100%">
<tr>
<td bgcolor="#525D76">
-<font face="arial,helvetica,sanserif" color="#ffffff">
+<font color="#ffffff" face="arial,helvetica,sanserif">
<a name="Legal Stuff They Make Us Say">
<strong>Legal Stuff They Make Us Say</strong>
</a>
@@ -174,7 +174,7 @@
<blockquote>
<p>
-All material on this website is Copyright © 1999-2005, The Apache
+All material on this website is Copyright © 1999-2006, The Apache
Software Foundation
</p>
@@ -195,14 +195,14 @@
</tr>
<tr>
<td>
-<br />
+<br/>
</td>
</tr>
</table>
-<table width="100%" cellpadding="2" cellspacing="0" border="0">
+<table border="0" cellspacing="0" cellpadding="2" width="100%">
<tr>
<td bgcolor="#525D76">
-<font face="arial,helvetica,sanserif" color="#ffffff">
+<font color="#ffffff" face="arial,helvetica,sanserif">
<a name="The Apache License">
<strong>The Apache License</strong>
</a>
@@ -215,7 +215,10 @@
<blockquote>
<p>
-All software produced by The Apache Software Foundation or any of its projects
or subjects is licensed according to the terms of <a
href="http://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version 2.0
(current) </a>.
+All software produced by The Apache Software Foundation or any of its
+projects or subjects is licensed according to the terms of
+<a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache License,
+Version 2.0 (current)</a>.
</p>
</blockquote>
@@ -224,7 +227,55 @@
</tr>
<tr>
<td>
-<br />
+<br/>
+</td>
+</tr>
+</table>
+<table border="0" cellspacing="0" cellpadding="2" width="100%">
+<tr>
+<td bgcolor="#525D76">
+<font color="#ffffff" face="arial,helvetica,sanserif">
+<a name="Trademarks">
+<strong>Trademarks</strong>
+</a>
+</font>
+</td>
+</tr>
+<tr>
+<td>
+<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
+ 6 of <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache License,
+ Version 2.0 (current)</a>.
+</p>
+ <p>If you create a product that uses Apache Tomcat software or provides
+ 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".
+ </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". You may not call your product
+ "Apache ..." or "Tomcat ...".</li>
+ </ul>
+ </p> </blockquote>
+</p>
+</td>
+</tr>
+<tr>
+<td>
+<br/>
</td>
</tr>
</table>
@@ -233,14 +284,14 @@
<!--FOOTER SEPARATOR-->
<tr>
<td colspan="2">
-<hr size="1" noshade="" />
+<hr noshade="" size="1"/>
</td>
</tr>
<!--PAGE FOOTER-->
<tr>
<td colspan="2">
<div align="center">
-<font size="-1" color="#525D76">
+<font color="#525D76" size="-1">
<em>
Copyright © 1999-2006, The Apache Software Foundation
</em>
Modified: tomcat/site/trunk/xdocs/legal.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/legal.xml?view=diff&rev=440204&r1=440203&r2=440204
==============================================================================
--- tomcat/site/trunk/xdocs/legal.xml (original)
+++ tomcat/site/trunk/xdocs/legal.xml Mon Sep 4 16:40:46 2006
@@ -11,7 +11,7 @@
<section name="Legal Stuff They Make Us Say">
<p>
-All material on this website is Copyright © 1999-2005, The Apache
+All material on this website is Copyright © 1999-2006, The Apache
Software Foundation
</p>
@@ -31,11 +31,39 @@
<section name="The Apache License">
<p>
-All software produced by The Apache Software Foundation or any of its projects
or subjects is licensed according to the terms of <a
href="http://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version 2.0
(current) </a>.
+All software produced by The Apache Software Foundation or any of its
+projects or subjects is licensed according to the terms of
+<a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache License,
+Version 2.0 (current)</a>.
</p>
</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
+ 6 of <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache License,
+ Version 2.0 (current)</a>.
+</p>
+ <p>If you create a product that uses Apache Tomcat software or provides
+ 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".
+ </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". You may not call your product
+ "Apache ..." or "Tomcat ...".</li>
+ </ul>
+ </p> </section>
</body>
</document>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
![http://www.apache.org/images/asf-logo.gif"](http://www.apache.org/images/asf-logo.gif"){kind=link}