Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/index.html?rev=279437&r1=279436&r2=279437&view=diff
==============================================================================
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Wed Sep  7 15:13:19 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
 <html>
 <head>
-<title>The Jakarta Site - Apache Tomcat</title>
+<title>Apache Tomcat - Apache Tomcat</title>
 <meta value="Marc A. Saegesser" name="author" />
 <meta value="[EMAIL PROTECTED]" name="email" />
 <meta value="Yoav Shapira" name="author" />
@@ -12,14 +12,21 @@
 <table cellspacing="0" width="100%" border="0">
 <!--PAGE HEADER-->
 <tr>
-<td colspan="2">
-<!--JAKARTA LOGO-->
-<a href="http://jakarta.apache.org/";>
-<img border="0" alt="The Jakarta Project" align="left" 
src="http://jakarta.apache.org/images/jakarta-logo.gif"; />
-</a>
+<td>
 <!--PROJECT LOGO-->
-<a href="http://jakarta.apache.org/tomcat/";>
-<img border="0" alt="The Apache Tomcat Project" align="right" 
src="./images/tomcat.gif" />
+<a href="http://tomcat.apache.org/";>
+<img border="0" alt="Tomcat Logo" align="left" src="./images/tomcat.gif" />
+</a>
+</td>
+<td>
+<font face="arial,helvetica,sanserif">
+<h1>Apache Tomcat</h1>
+</font>
+</td>
+<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"; />
 </a>
 </td>
 </tr>
@@ -41,82 +48,59 @@
 <li>
 <a href="./index.html">Home</a>
 </li>
-<li>
-<a href="./bugreport.html">Bug Database</a>
-</li>
-<li>
-<a href="./resources.html">Resources</a>
-</li>
-<li>
-<a href="./irc.html">IRC</a>
-</li>
-<li>
-<a href="./faq/">FAQ</a>
-</li>
 </ul>
 <p>
-<strong>Documentation</strong>
+<strong>Download</strong>
 </p>
 <ul>
 <li>
-<a href="./tomcat-5.5-doc/index.html">Apache Tomcat 5.5</a>
+<a href="./whichversion.html">Which version?</a>
 </li>
 <li>
-<a href="./tomcat-5.0-doc/index.html">Apache Tomcat 5.0</a>
+<a href="./download-55.cgi">Apache Tomcat 5.5</a>
 </li>
 <li>
-<a href="./tomcat-4.1-doc/index.html">Apache Tomcat 4.1</a>
+<a href="./download-41.cgi">Apache Tomcat 4.1</a>
 </li>
 <li>
-<a href="./tomcat-3.3-doc/index.html">Apache Tomcat 3.3</a>
+<a href="./download-33.cgi">Apache Tomcat 3.3</a>
+</li>
+<li>
+<a href="http://archive.apache.org/dist/";>Archives</a>
 </li>
 </ul>
 <p>
-<strong>Download</strong>
+<strong>Problems?</strong>
 </p>
 <ul>
 <li>
-<a 
href="http://jakarta.apache.org/site/downloads/downloads_tomcat-5.cgi";>Current 
Releases</a>
-</li>
-<li>
-<a 
href="http://jakarta.apache.org/site/downloads/downloads_tomcat-5.cgi";>Apache 
Tomcat 5.x</a>
+<a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a 
href="http://jakarta.apache.org/site/downloads/downloads_tomcat-4.cgi";>Apache 
Tomcat 4.x</a>
+<a href="./faq/">FAQ</a>
 </li>
 <li>
-<a 
href="http://jakarta.apache.org/site/downloads/downloads_tomcat-3.cgi";>Apache 
Tomcat 3.x</a>
+<a href="./mail.html">Mailing Lists</a>
 </li>
-</ul>
-<p>
-<strong>Archives</strong>
-</p>
-<ul>
 <li>
-<a href="./tomcat-4.0-doc/index.html">Apache Tomcat 4.0</a>
+<a href="./bugreport.html">Bug Database</a>
 </li>
 <li>
-<a href="./tomcat-3.2-doc/index.html">Apache Tomcat 3.2</a>
+<a href="./irc.html">IRC</a>
 </li>
 </ul>
 <p>
-<strong>Jakarta</strong>
+<strong>Documentation</strong>
 </p>
 <ul>
 <li>
-<a href="./../index.html">Front Page</a>
-</li>
-<li>
-<a href="http://jakarta.apache.org/site/news.html";>News &amp; Status</a>
-</li>
-<li>
-<a href="http://jakarta.apache.org/site/mission.html";>Mission</a>
+<a href="./tomcat-5.5-doc/index.html">Apache Tomcat 5.5</a>
 </li>
 <li>
-<a href="http://jakarta.apache.org/site/guidelines.html";>Guidelines Notes</a>
+<a href="./tomcat-4.1-doc/index.html">Apache Tomcat 4.1</a>
 </li>
 <li>
-<a href="http://jakarta.apache.org/site/faqs.html";>FAQs</a>
+<a href="./tomcat-3.3-doc/index.html">Apache Tomcat 3.3</a>
 </li>
 </ul>
 <p>
@@ -124,16 +108,13 @@
 </p>
 <ul>
 <li>
-<a href="http://jakarta.apache.org/site/getinvolved.html";>Overview</a>
-</li>
-<li>
-<a href="http://jakarta.apache.org/site/cvsindex.html";>CVS Repositories</a>
+<a href="./getinvolved.html">Overview</a>
 </li>
 <li>
-<a href="http://jakarta.apache.org/site/mail.html";>Mailing Lists</a>
+<a href="./svnindex.html">SVN Repositories</a>
 </li>
 <li>
-<a href="http://jakarta.apache.org/site/library.html";>Reference Library</a>
+<a href="./lists.html">Mailing Lists</a>
 </li>
 </ul>
 <p>
@@ -141,16 +122,22 @@
 </p>
 <ul>
 <li>
-<a href="http://jakarta.apache.org/site/whoweare.html";>Who We Are</a>
+<a href="./whoweare.html">Who We Are</a>
+</li>
+<li>
+<a href="./heritage.html">Heritage</a>
 </li>
 <li>
-<a 
href="http://jakarta.apache.org/site/acknowledgements.html";>Acknowledgements</a>
+<a href="http://www.apache.org";>Apache Home</a>
 </li>
 <li>
-<a href="http://jakarta.apache.org/site/contact.html";>Contact</a>
+<a href="./resources.html">Resources</a>
+</li>
+<li>
+<a href="./contact.html">Contact</a>
 </li>
 <li>
-<a href="http://jakarta.apache.org/site/legal.html";>Legal</a>
+<a href="./legal.html">Legal</a>
 </li>
 </ul>
 </td>
@@ -256,9 +243,8 @@
 
 </table>
 
-<p>The releases are described in more detail below to help you determine 
-which one is right for you.  More details about each release can be found in 
-the associated release notes.</p> 
+<p>To help you determine which release is right for you, the
+<a href="whichversion.html">releases are described in more detail</a>.</p> 
 
 <p>Please note that alhough we offer downloads and documentation of older
 releases, such as Apache Tomcat 3.x and 4.x, we strongly encourage users to 
use the
@@ -268,204 +254,6 @@
 community-driven support approach, the older your version the less people would
 be interested or able to support you.
 </p>
-
-<table width="100%" cellpadding="2" cellspacing="0" border="0">
-<tr>
-<td bgcolor="#828DA6">
-<font face="arial,helvetica,sanserif" color="#ffffff">
-<a name="Apache Tomcat 5.x">
-<strong>Apache Tomcat 5.x</strong>
-</a>
-</font>
-</td>
-</tr>
-<tr>
-<td>
-<blockquote>
-
-<p>
-<strong>Apache Tomcat 5.5.x</strong>.  Apache Tomcat 5.5 is the current focus 
of
-development.  While it supports the same Servlet and JSP
-Specification versions as Apache Tomcat 5.0.x, there are significant changes
-in many areas under the hood, resulting in improved performance, stability,
-and total cost of ownership.  Please refer to the Apache Tomcat 5.5 Changelog
-for details.
-</p>
-
-<p>
-<strong>Apache Tomcat 5.0.x</strong>.  Apache Tomcat 5.0 improves on Apache 
Tomcat 4.1 in many
-ways, including:
-<ul>
-<li>Performance optimizations and reduced garbage collection</li>
-<li>Refactored application deployer, with an optional standalone deployer 
-allowing validation and compilation of a web application before putting 
-it in production</li>
-<li>Complete server monitoring using JMX and the manager web application</li>
-<li>Scalability and reliability enhancements</li>
-<li>Improved Taglibs handling, including advanced pooling and tag plugins</li>
-<li>Improved platform integration, with native Windows and Unix wrappers</li>
-<li>Embedding using JMX</li>
-<li>Enhanced Security Manager support</li>
-<li>Integrated session clustering</li>
-<li>Expanded documentation</li>
-</ul>
-</p>
-
-</blockquote>
-</td>
-</tr>
-<tr>
-<td>
-<br />
-</td>
-</tr>
-</table>
-
-<table width="100%" cellpadding="2" cellspacing="0" border="0">
-<tr>
-<td bgcolor="#828DA6">
-<font face="arial,helvetica,sanserif" color="#ffffff">
-<a name="Apache Tomcat 4.x">
-<strong>Apache Tomcat 4.x</strong>
-</a>
-</font>
-</td>
-</tr>
-<tr>
-<td>
-<blockquote>
-
-<p>
-<strong>Apache Tomcat 4.x</strong> implements a new servlet container (called
-Catalina) that is based on completely new architecture.  The 4.x releases
-implement the <strong>Servlet 2.3</strong> and <strong>JSP 1.2</strong>
-specifications.</p>
-
-<p>
-<strong>We encourage all users to upgrade to Apache Tomcat 5.x whenever
-possible.</strong>
-</p>
-
-<p>
-<strong>Apache Tomcat 4.1.x</strong>. Apache Tomcat 4.1 is a refactoring 
-of Apache Tomcat 4.0.x, and contains significant enhancements, including:
-<ul>
-<li>JMX based administration features</li>
-<li>JSP and Struts based administration web application</li>
-<li>New Coyote connector (HTTP/1.1, AJP 1.3 and JNI support)</li>
-<li>Rewritten Jasper JSP page compiler</li>
-<li>Performance and memory efficiency improvements</li>
-<li>Enhanced manager application support for integration with development 
-tools</li>
-<li>Custom Ant tasks to interact with the manager application directly 
-from build.xml scripts</li>
-</ul>
-</p>
-
-<p>
-<strong>Apache Tomcat 4.0.x</strong>.  Apache Tomcat 4.0.6 is the old 
production
-quality release.  The 4.0 servlet
-container (Catalina) has been developed from the ground up for flexibility and
-performance.  Version 4.0 implements the final released versions of the Servlet
-2.3 and JSP 1.2 specifications.  As required by the specifications, Apache 
Tomcat 4.0
-also supports web applications built for the Servlet 2.2 and JSP 1.1
-specifications with no changes.</p>
-
-<p>
-<strong>We encourage all users to upgrade to Apache Tomcat 5.x whenever
-possible.</strong>
-</p>
-
-</blockquote>
-</td>
-</tr>
-<tr>
-<td>
-<br />
-</td>
-</tr>
-</table>
-
-<table width="100%" cellpadding="2" cellspacing="0" border="0">
-<tr>
-<td bgcolor="#828DA6">
-<font face="arial,helvetica,sanserif" color="#ffffff">
-<a name="Apache Tomcat 3.x">
-<strong>Apache Tomcat 3.x</strong>
-</a>
-</font>
-</td>
-</tr>
-<tr>
-<td>
-<blockquote>
-
-<p>There are several versions of <strong>Apache Tomcat 3.x</strong> currently
-available for download:</p>
-
-<ul>
-<li>Version <strong>3.3</strong> is the current production quality release for
-the Servlet 2.2 and JSP 1.1 specifications.  Apache Tomcat 3.3 is the latest
-continuation of the Apache Tomcat 3.x architecture and it is more advanced 
then 3.2.4,
-which is the 'old' production quality release.</li>
-<li>Version 3.2.4 is the 'old' production quality release and is now in
-maintenance only mode.</li>
-<li>Version 3.1.1 is a legacy release.</li>
-</ul>
-
-<p>
-All <strong>Apache Tomcat 3.x</strong> releases trace their heritage back to 
the
-original Servlet and JSP implementations that Sun donated to the Apache
-Software Foundation.  The 3.x versions all implement the <strong>Servlet
-2.2</strong> and <strong>JSP 1.1</strong> specifications.
-</p>
-
-<p>
-<strong>Apache Tomcat 3.3.x</strong>. Version 3.3.2 is the current production 
-quality release. It continues the refactoring that was begun in version 3.2 and
-carries it to its logical conclusion.  Version 3.3 provides a much more modular
-design and allows the servlet container to be customized by adding and removing
-modules that control the processing of servlet requests.  This version also
-contains many performance improvements.</p> 
-
-<p>
-<strong>Apache Tomcat 3.2.x</strong>.  Version 3.2 added few new features 
-since 3.1; the major effort was a refactoring of the internals to improve 
-performance and stability.  The 3.2.1 release, like 3.1.1, was a security 
-patch.  Version 3.2.2 fixed a large number of bugs and all known 
-specification compliance issues.  Version 3.2.3 was a security update that 
-closes a serious security hole.  Version 3.2.4 is a minor bug fix release.  
-All users of Apache Tomcat versions prior to 3.2.3 should updgrade as soon as 
-possible.  With the exception of fixes for critical security related bugs, 
-development on the Apache Tomcat 3.2.x branch has stopped.</p> 
-
-<p>
-<strong>Apache Tomcat 3.1.x</strong>.  The 3.1 release contained several 
-improvements over Apache Tomcat 3.0, including servlet reloading, WAR file 
-support and added connectors for the IIS and Netscape web servers.  The 
-latest maintenance release, 3.1.1, contained fixes for security problems.  
-There is no active development ongoing for Apache Tomcat 3.1.x.  Users of 
Apache Tomcat 
-3.1 should update to 3.1.1 to close the security holes and they are 
-strongly encouraged to migrate to the current production release, Apache 
Tomcat 
-3.3.</p> 
-
-<p>
-<strong>Apache Tomcat 3.0.x</strong>. Initial Apache Tomcat release.</p>
-
-<p>
-<strong>We encourage all users to upgrade to Apache Tomcat 5.x whenever
-possible.</strong>
-</p>
-
-</blockquote>
-</td>
-</tr>
-<tr>
-<td>
-<br />
-</td>
-</tr>
-</table>
 
 </blockquote>
 </p>

Modified: tomcat/site/trunk/docs/irc.html
URL: 
http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/irc.html?rev=279437&r1=279436&r2=279437&view=diff
==============================================================================
--- tomcat/site/trunk/docs/irc.html (original)
+++ tomcat/site/trunk/docs/irc.html Wed Sep  7 15:13:19 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
 <html>
 <head>
-<title>The Jakarta Site - Apache Tomcat on IRC</title>
+<title>Apache Tomcat - Apache Tomcat on IRC</title>
 <meta value="Marc A. Saegesser" name="author" />
 <meta value="[EMAIL PROTECTED]" name="email" />
 </head>
@@ -10,14 +10,21 @@
 <table cellspacing="0" width="100%" border="0">
 <!--PAGE HEADER-->
 <tr>
-<td colspan="2">
-<!--JAKARTA LOGO-->
-<a href="http://jakarta.apache.org/";>
-<img border="0" alt="The Jakarta Project" align="left" 
src="http://jakarta.apache.org/images/jakarta-logo.gif"; />
-</a>
+<td>
 <!--PROJECT LOGO-->
-<a href="http://jakarta.apache.org/tomcat/";>
-<img border="0" alt="The Apache Tomcat Project" align="right" 
src="./images/tomcat.gif" />
+<a href="http://tomcat.apache.org/";>
+<img border="0" alt="Tomcat Logo" align="left" src="./images/tomcat.gif" />
+</a>
+</td>
+<td>
+<font face="arial,helvetica,sanserif">
+<h1>Apache Tomcat</h1>
+</font>
+</td>
+<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"; />
 </a>
 </td>
 </tr>
@@ -39,82 +46,59 @@
 <li>
 <a href="./index.html">Home</a>
 </li>
-<li>
-<a href="./bugreport.html">Bug Database</a>
-</li>
-<li>
-<a href="./resources.html">Resources</a>
-</li>
-<li>
-<a href="./irc.html">IRC</a>
-</li>
-<li>
-<a href="./faq/">FAQ</a>
-</li>
 </ul>
 <p>
-<strong>Documentation</strong>
+<strong>Download</strong>
 </p>
 <ul>
 <li>
-<a href="./tomcat-5.5-doc/index.html">Apache Tomcat 5.5</a>
+<a href="./whichversion.html">Which version?</a>
 </li>
 <li>
-<a href="./tomcat-5.0-doc/index.html">Apache Tomcat 5.0</a>
+<a href="./download-55.cgi">Apache Tomcat 5.5</a>
 </li>
 <li>
-<a href="./tomcat-4.1-doc/index.html">Apache Tomcat 4.1</a>
+<a href="./download-41.cgi">Apache Tomcat 4.1</a>
 </li>
 <li>
-<a href="./tomcat-3.3-doc/index.html">Apache Tomcat 3.3</a>
+<a href="./download-33.cgi">Apache Tomcat 3.3</a>
+</li>
+<li>
+<a href="http://archive.apache.org/dist/";>Archives</a>
 </li>
 </ul>
 <p>
-<strong>Download</strong>
+<strong>Problems?</strong>
 </p>
 <ul>
 <li>
-<a 
href="http://jakarta.apache.org/site/downloads/downloads_tomcat-5.cgi";>Current 
Releases</a>
+<a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a 
href="http://jakarta.apache.org/site/downloads/downloads_tomcat-5.cgi";>Apache 
Tomcat 5.x</a>
-</li>
-<li>
-<a 
href="http://jakarta.apache.org/site/downloads/downloads_tomcat-4.cgi";>Apache 
Tomcat 4.x</a>
+<a href="./faq/">FAQ</a>
 </li>
 <li>
-<a 
href="http://jakarta.apache.org/site/downloads/downloads_tomcat-3.cgi";>Apache 
Tomcat 3.x</a>
+<a href="./mail.html">Mailing Lists</a>
 </li>
-</ul>
-<p>
-<strong>Archives</strong>
-</p>
-<ul>
 <li>
-<a href="./tomcat-4.0-doc/index.html">Apache Tomcat 4.0</a>
+<a href="./bugreport.html">Bug Database</a>
 </li>
 <li>
-<a href="./tomcat-3.2-doc/index.html">Apache Tomcat 3.2</a>
+<a href="./irc.html">IRC</a>
 </li>
 </ul>
 <p>
-<strong>Jakarta</strong>
+<strong>Documentation</strong>
 </p>
 <ul>
 <li>
-<a href="./../index.html">Front Page</a>
-</li>
-<li>
-<a href="http://jakarta.apache.org/site/news.html";>News &amp; Status</a>
-</li>
-<li>
-<a href="http://jakarta.apache.org/site/mission.html";>Mission</a>
+<a href="./tomcat-5.5-doc/index.html">Apache Tomcat 5.5</a>
 </li>
 <li>
-<a href="http://jakarta.apache.org/site/guidelines.html";>Guidelines Notes</a>
+<a href="./tomcat-4.1-doc/index.html">Apache Tomcat 4.1</a>
 </li>
 <li>
-<a href="http://jakarta.apache.org/site/faqs.html";>FAQs</a>
+<a href="./tomcat-3.3-doc/index.html">Apache Tomcat 3.3</a>
 </li>
 </ul>
 <p>
@@ -122,16 +106,13 @@
 </p>
 <ul>
 <li>
-<a href="http://jakarta.apache.org/site/getinvolved.html";>Overview</a>
-</li>
-<li>
-<a href="http://jakarta.apache.org/site/cvsindex.html";>CVS Repositories</a>
+<a href="./getinvolved.html">Overview</a>
 </li>
 <li>
-<a href="http://jakarta.apache.org/site/mail.html";>Mailing Lists</a>
+<a href="./svnindex.html">SVN Repositories</a>
 </li>
 <li>
-<a href="http://jakarta.apache.org/site/library.html";>Reference Library</a>
+<a href="./lists.html">Mailing Lists</a>
 </li>
 </ul>
 <p>
@@ -139,16 +120,22 @@
 </p>
 <ul>
 <li>
-<a href="http://jakarta.apache.org/site/whoweare.html";>Who We Are</a>
+<a href="./whoweare.html">Who We Are</a>
+</li>
+<li>
+<a href="./heritage.html">Heritage</a>
 </li>
 <li>
-<a 
href="http://jakarta.apache.org/site/acknowledgements.html";>Acknowledgements</a>
+<a href="http://www.apache.org";>Apache Home</a>
+</li>
+<li>
+<a href="./resources.html">Resources</a>
 </li>
 <li>
-<a href="http://jakarta.apache.org/site/contact.html";>Contact</a>
+<a href="./contact.html">Contact</a>
 </li>
 <li>
-<a href="http://jakarta.apache.org/site/legal.html";>Legal</a>
+<a href="./legal.html">Legal</a>
 </li>
 </ul>
 </td>

Added: tomcat/site/trunk/docs/legal.html
URL: 
http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/legal.html?rev=279437&view=auto
==============================================================================
--- tomcat/site/trunk/docs/legal.html (added)
+++ tomcat/site/trunk/docs/legal.html Wed Sep  7 15:13:19 2005
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="iso-8859-1"?>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>

+<html>

+<head>

+<title>Apache Tomcat - Legal Stuff They Make Us Say</title>

+<meta value="Apache Jakarta Project" name="author" />

+<meta value="general.AT.jakarta.DOT.apache.DOT.org" name="email" />

+</head>

+<body vlink="#525D76" alink="#525D76" link="#525D76" text="#000000" 
bgcolor="#ffffff">

+<table cellspacing="0" width="100%" border="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" />

+</a>

+</td>

+<td>

+<font face="arial,helvetica,sanserif">

+<h1>Apache Tomcat</h1>

+</font>

+</td>

+<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"; />

+</a>

+</td>

+</tr>

+</table>

+<table cellspacing="4" width="100%" border="0">

+<!--HEADER SEPARATOR-->

+<tr>

+<td colspan="2">

+<hr size="1" noshade="" />

+</td>

+</tr>

+<tr>

+<!--LEFT SIDE NAVIGATION-->

+<td nowrap="true" valign="top" width="20%">

+<p>

+<strong>Apache Tomcat</strong>

+</p>

+<ul>

+<li>

+<a href="./index.html">Home</a>

+</li>

+</ul>

+<p>

+<strong>Download</strong>

+</p>

+<ul>

+<li>

+<a href="./whichversion.html">Which version?</a>

+</li>

+<li>

+<a href="./download-55.cgi">Apache Tomcat 5.5</a>

+</li>

+<li>

+<a href="./download-41.cgi">Apache Tomcat 4.1</a>

+</li>

+<li>

+<a href="./download-33.cgi">Apache Tomcat 3.3</a>

+</li>

+<li>

+<a href="http://archive.apache.org/dist/";>Archives</a>

+</li>

+</ul>

+<p>

+<strong>Problems?</strong>

+</p>

+<ul>

+<li>

+<a href="./findhelp.html">Find help</a>

+</li>

+<li>

+<a href="./faq/">FAQ</a>

+</li>

+<li>

+<a href="./mail.html">Mailing Lists</a>

+</li>

+<li>

+<a href="./bugreport.html">Bug Database</a>

+</li>

+<li>

+<a href="./irc.html">IRC</a>

+</li>

+</ul>

+<p>

+<strong>Documentation</strong>

+</p>

+<ul>

+<li>

+<a href="./tomcat-5.5-doc/index.html">Apache Tomcat 5.5</a>

+</li>

+<li>

+<a href="./tomcat-4.1-doc/index.html">Apache Tomcat 4.1</a>

+</li>

+<li>

+<a href="./tomcat-3.3-doc/index.html">Apache Tomcat 3.3</a>

+</li>

+</ul>

+<p>

+<strong>Get Involved</strong>

+</p>

+<ul>

+<li>

+<a href="./getinvolved.html">Overview</a>

+</li>

+<li>

+<a href="./svnindex.html">SVN Repositories</a>

+</li>

+<li>

+<a href="./lists.html">Mailing Lists</a>

+</li>

+</ul>

+<p>

+<strong>Misc</strong>

+</p>

+<ul>

+<li>

+<a href="./whoweare.html">Who We Are</a>

+</li>

+<li>

+<a href="./heritage.html">Heritage</a>

+</li>

+<li>

+<a href="http://www.apache.org";>Apache Home</a>

+</li>

+<li>

+<a href="./resources.html">Resources</a>

+</li>

+<li>

+<a href="./contact.html">Contact</a>

+</li>

+<li>

+<a href="./legal.html">Legal</a>

+</li>

+</ul>

+</td>

+<!--RIGHT SIDE MAIN BODY-->

+<td align="left" valign="top" width="80%">

+<table width="100%" cellpadding="2" cellspacing="0" border="0">

+<tr>

+<td bgcolor="#525D76">

+<font face="arial,helvetica,sanserif" color="#ffffff">

+<a name="Legal Stuff They Make Us Say">

+<strong>Legal Stuff They Make Us Say</strong>

+</a>

+</font>

+</td>

+</tr>

+<tr>

+<td>

+<p>

+<blockquote>

+

+<p>

+All material on this website is Copyright © 1999-2005, The Apache 

+Software Foundation

+</p>

+

+<p>

+Sun, Sun Microsystems, Solaris, Java, JavaServer Web Development Kit, 

+and JavaServer Pages are trademarks or registered trademarks of Sun 

+Microsystems, Inc. UNIX is a registered trademark in the United States 

+and other countries, exclusively licensed through 'The Open Group'.

+Microsoft, Windows, WindowsNT, and Win32 are registered trademarks of 

+Microsoft Corporation. Linux is a registered trademark of Linus Torvalds.

+All other product names mentioned herein and throughout the entire

+web site are trademarks of their respective owners.

+</p>

+

+  </blockquote>

+</p>

+</td>

+</tr>

+<tr>

+<td>

+<br />

+</td>

+</tr>

+</table>

+<table width="100%" cellpadding="2" cellspacing="0" border="0">

+<tr>

+<td bgcolor="#525D76">

+<font face="arial,helvetica,sanserif" color="#ffffff">

+<a name="The Apache License">

+<strong>The Apache License</strong>

+</a>

+</font>

+</td>

+</tr>

+<tr>

+<td>

+<p>

+<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>.

+</p>

+

+  </blockquote>

+</p>

+</td>

+</tr>

+<tr>

+<td>

+<br />

+</td>

+</tr>

+</table>

+</td>

+</tr>

+<!--FOOTER SEPARATOR-->

+<tr>

+<td colspan="2">

+<hr size="1" noshade="" />

+</td>

+</tr>

+<!--PAGE FOOTER-->

+<tr>

+<td colspan="2">

+<div align="center">

+<font size="-1" color="#525D76">

+<em>

+        Copyright © 1999-2005, The Apache Software Foundation

+        </em>

+</font>

+</div>

+</td>

+</tr>

+</table>

+</body>

+</html>


Modified: tomcat/site/trunk/docs/lists.html
URL: 
http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/lists.html?rev=279437&r1=279436&r2=279437&view=diff
==============================================================================
--- tomcat/site/trunk/docs/lists.html (original)
+++ tomcat/site/trunk/docs/lists.html Wed Sep  7 15:13:19 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>

 <html>

 <head>

-<title>The Jakarta Site - Apache Tomcat Mailing Lists</title>

+<title>Apache Tomcat - Apache Tomcat Mailing Lists</title>

 <meta value="HTTPD Documentation Group" name="author" />

 <meta value="" name="email" />

 </head>

@@ -10,14 +10,21 @@
 <table cellspacing="0" width="100%" border="0">

 <!--PAGE HEADER-->

 <tr>

-<td colspan="2">

-<!--JAKARTA LOGO-->

-<a href="http://jakarta.apache.org/";>

-<img border="0" alt="The Jakarta Project" align="left" 
src="http://jakarta.apache.org/images/jakarta-logo.gif"; />

-</a>

+<td>

 <!--PROJECT LOGO-->

-<a href="http://jakarta.apache.org/tomcat/";>

-<img border="0" alt="The Apache Tomcat Project" align="right" 
src="./images/tomcat.gif" />

+<a href="http://tomcat.apache.org/";>

+<img border="0" alt="Tomcat Logo" align="left" src="./images/tomcat.gif" />

+</a>

+</td>

+<td>

+<font face="arial,helvetica,sanserif">

+<h1>Apache Tomcat</h1>

+</font>

+</td>

+<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"; />

 </a>

 </td>

 </tr>

@@ -39,85 +46,59 @@
 <li>

 <a href="./index.html">Home</a>

 </li>

-<li>

-<a href="./download.cgi">Downloads</a>

-</li>

-<li>

-<a href="./lists.html">Mailing Lists</a>

-</li>

-<li>

-<a href="./bugreport.html">Bug Database</a>

-</li>

-<li>

-<a href="./resources.html">Resources</a>

-</li>

-<li>

-<a href="./irc.html">IRC</a>

-</li>

-<li>

-<a href="./faq/">FAQ</a>

-</li>

 </ul>

 <p>

-<strong>Documentation</strong>

+<strong>Download</strong>

 </p>

 <ul>

 <li>

-<a href="./tomcat-5.5-doc/index.html">Apache Tomcat 5.5</a>

+<a href="./whichversion.html">Which version?</a>

 </li>

 <li>

-<a href="./tomcat-5.0-doc/index.html">Apache Tomcat 5.0</a>

+<a href="./download-55.cgi">Apache Tomcat 5.5</a>

 </li>

 <li>

-<a href="./tomcat-4.1-doc/index.html">Apache Tomcat 4.1</a>

+<a href="./download-41.cgi">Apache Tomcat 4.1</a>

 </li>

 <li>

-<a href="./tomcat-3.3-doc/index.html">Apache Tomcat 3.3</a>

+<a href="./download-33.cgi">Apache Tomcat 3.3</a>

+</li>

+<li>

+<a href="http://archive.apache.org/dist/";>Archives</a>

 </li>

 </ul>

 <p>

-<strong>Download</strong>

+<strong>Problems?</strong>

 </p>

 <ul>

 <li>

-<a 
href="http://jakarta.apache.org/site/downloads/downloads_tomcat-5.cgi";>Current 
Releases</a>

-</li>

-<li>

-<a 
href="http://jakarta.apache.org/site/downloads/downloads_tomcat-5.cgi";>Apache 
Tomcat 5.x</a>

+<a href="./findhelp.html">Find help</a>

 </li>

 <li>

-<a 
href="http://jakarta.apache.org/site/downloads/downloads_tomcat-4.cgi";>Apache 
Tomcat 4.x</a>

+<a href="./faq/">FAQ</a>

 </li>

 <li>

-<a 
href="http://jakarta.apache.org/site/downloads/downloads_tomcat-3.cgi";>Apache 
Tomcat 3.x</a>

+<a href="./mail.html">Mailing Lists</a>

 </li>

-</ul>

-<p>

-<strong>Archives</strong>

-</p>

-<ul>

 <li>

-<a href="./tomcat-4.0-doc/index.html">Apache Tomcat 4.0</a>

+<a href="./bugreport.html">Bug Database</a>

 </li>

 <li>

-<a href="./tomcat-3.2-doc/index.html">Apache Tomcat 3.2</a>

+<a href="./irc.html">IRC</a>

 </li>

 </ul>

 <p>

-<strong>Jakarta</strong>

+<strong>Documentation</strong>

 </p>

 <ul>

 <li>

-<a href="http://jakarta.apache.org/site/news.html";>News &amp; Status</a>

-</li>

-<li>

-<a href="http://jakarta.apache.org/site/mission.html";>Mission</a>

+<a href="./tomcat-5.5-doc/index.html">Apache Tomcat 5.5</a>

 </li>

 <li>

-<a href="http://jakarta.apache.org/site/guidelines.html";>Guidelines Notes</a>

+<a href="./tomcat-4.1-doc/index.html">Apache Tomcat 4.1</a>

 </li>

 <li>

-<a href="http://jakarta.apache.org/site/faqs.html";>FAQs</a>

+<a href="./tomcat-3.3-doc/index.html">Apache Tomcat 3.3</a>

 </li>

 </ul>

 <p>

@@ -125,13 +106,13 @@
 </p>

 <ul>

 <li>

-<a href="http://jakarta.apache.org/site/getinvolved.html";>Overview</a>

+<a href="./getinvolved.html">Overview</a>

 </li>

 <li>

-<a href="http://jakarta.apache.org/site/cvsindex.html";>CVS Repositories</a>

+<a href="./svnindex.html">SVN Repositories</a>

 </li>

 <li>

-<a href="http://jakarta.apache.org/site/library.html";>Reference Library</a>

+<a href="./lists.html">Mailing Lists</a>

 </li>

 </ul>

 <p>

@@ -139,16 +120,22 @@
 </p>

 <ul>

 <li>

-<a href="http://jakarta.apache.org/site/whoweare.html";>Who We Are</a>

+<a href="./whoweare.html">Who We Are</a>

+</li>

+<li>

+<a href="./heritage.html">Heritage</a>

 </li>

 <li>

-<a 
href="http://jakarta.apache.org/site/acknowledgements.html";>Acknowledgements</a>

+<a href="http://www.apache.org";>Apache Home</a>

+</li>

+<li>

+<a href="./resources.html">Resources</a>

 </li>

 <li>

-<a href="http://jakarta.apache.org/site/contact.html";>Contact</a>

+<a href="./contact.html">Contact</a>

 </li>

 <li>

-<a href="http://jakarta.apache.org/site/legal.html";>Legal</a>

+<a href="./legal.html">Legal</a>

 </li>

 </ul>

 </td>

@@ -169,7 +156,7 @@
 <p>

 <blockquote>

 

-<p>The following mailing lists relate to the Apache HTTP Server

+<p>The following mailing lists relate to the Apache Tomcat

 project.  Users should consider subscribing to the <a 
href="#tomcat-announce">Announcements</a> or <a href="#tomcat-user">User

 Support</a> mailing lists.  Other lists are for people interested in

 helping with the development and debugging of the server.</p>


Modified: tomcat/site/trunk/docs/resources.html
URL: 
http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/resources.html?rev=279437&r1=279436&r2=279437&view=diff
==============================================================================
--- tomcat/site/trunk/docs/resources.html (original)
+++ tomcat/site/trunk/docs/resources.html Wed Sep  7 15:13:19 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
 <html>
 <head>
-<title>The Jakarta Site - Apache Tomcat Resources</title>
+<title>Apache Tomcat - Apache Tomcat Resources</title>
 <meta value="Remy Maucherat" name="author" />
 <meta value="[EMAIL PROTECTED]" name="email" />
 </head>
@@ -10,14 +10,21 @@
 <table cellspacing="0" width="100%" border="0">
 <!--PAGE HEADER-->
 <tr>
-<td colspan="2">
-<!--JAKARTA LOGO-->
-<a href="http://jakarta.apache.org/";>
-<img border="0" alt="The Jakarta Project" align="left" 
src="http://jakarta.apache.org/images/jakarta-logo.gif"; />
-</a>
+<td>
 <!--PROJECT LOGO-->
-<a href="http://jakarta.apache.org/tomcat/";>
-<img border="0" alt="The Apache Tomcat Project" align="right" 
src="./images/tomcat.gif" />
+<a href="http://tomcat.apache.org/";>
+<img border="0" alt="Tomcat Logo" align="left" src="./images/tomcat.gif" />
+</a>
+</td>
+<td>
+<font face="arial,helvetica,sanserif">
+<h1>Apache Tomcat</h1>
+</font>
+</td>
+<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"; />
 </a>
 </td>
 </tr>
@@ -39,82 +46,59 @@
 <li>
 <a href="./index.html">Home</a>
 </li>
-<li>
-<a href="./bugreport.html">Bug Database</a>
-</li>
-<li>
-<a href="./resources.html">Resources</a>
-</li>
-<li>
-<a href="./irc.html">IRC</a>
-</li>
-<li>
-<a href="./faq/">FAQ</a>
-</li>
 </ul>
 <p>
-<strong>Documentation</strong>
+<strong>Download</strong>
 </p>
 <ul>
 <li>
-<a href="./tomcat-5.5-doc/index.html">Apache Tomcat 5.5</a>
+<a href="./whichversion.html">Which version?</a>
 </li>
 <li>
-<a href="./tomcat-5.0-doc/index.html">Apache Tomcat 5.0</a>
+<a href="./download-55.cgi">Apache Tomcat 5.5</a>
 </li>
 <li>
-<a href="./tomcat-4.1-doc/index.html">Apache Tomcat 4.1</a>
+<a href="./download-41.cgi">Apache Tomcat 4.1</a>
 </li>
 <li>
-<a href="./tomcat-3.3-doc/index.html">Apache Tomcat 3.3</a>
+<a href="./download-33.cgi">Apache Tomcat 3.3</a>
+</li>
+<li>
+<a href="http://archive.apache.org/dist/";>Archives</a>
 </li>
 </ul>
 <p>
-<strong>Download</strong>
+<strong>Problems?</strong>
 </p>
 <ul>
 <li>
-<a 
href="http://jakarta.apache.org/site/downloads/downloads_tomcat-5.cgi";>Current 
Releases</a>
+<a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a 
href="http://jakarta.apache.org/site/downloads/downloads_tomcat-5.cgi";>Apache 
Tomcat 5.x</a>
-</li>
-<li>
-<a 
href="http://jakarta.apache.org/site/downloads/downloads_tomcat-4.cgi";>Apache 
Tomcat 4.x</a>
+<a href="./faq/">FAQ</a>
 </li>
 <li>
-<a 
href="http://jakarta.apache.org/site/downloads/downloads_tomcat-3.cgi";>Apache 
Tomcat 3.x</a>
+<a href="./mail.html">Mailing Lists</a>
 </li>
-</ul>
-<p>
-<strong>Archives</strong>
-</p>
-<ul>
 <li>
-<a href="./tomcat-4.0-doc/index.html">Apache Tomcat 4.0</a>
+<a href="./bugreport.html">Bug Database</a>
 </li>
 <li>
-<a href="./tomcat-3.2-doc/index.html">Apache Tomcat 3.2</a>
+<a href="./irc.html">IRC</a>
 </li>
 </ul>
 <p>
-<strong>Jakarta</strong>
+<strong>Documentation</strong>
 </p>
 <ul>
 <li>
-<a href="./../index.html">Front Page</a>
-</li>
-<li>
-<a href="http://jakarta.apache.org/site/news.html";>News &amp; Status</a>
-</li>
-<li>
-<a href="http://jakarta.apache.org/site/mission.html";>Mission</a>
+<a href="./tomcat-5.5-doc/index.html">Apache Tomcat 5.5</a>
 </li>
 <li>
-<a href="http://jakarta.apache.org/site/guidelines.html";>Guidelines Notes</a>
+<a href="./tomcat-4.1-doc/index.html">Apache Tomcat 4.1</a>
 </li>
 <li>
-<a href="http://jakarta.apache.org/site/faqs.html";>FAQs</a>
+<a href="./tomcat-3.3-doc/index.html">Apache Tomcat 3.3</a>
 </li>
 </ul>
 <p>
@@ -122,16 +106,13 @@
 </p>
 <ul>
 <li>
-<a href="http://jakarta.apache.org/site/getinvolved.html";>Overview</a>
-</li>
-<li>
-<a href="http://jakarta.apache.org/site/cvsindex.html";>CVS Repositories</a>
+<a href="./getinvolved.html">Overview</a>
 </li>
 <li>
-<a href="http://jakarta.apache.org/site/mail.html";>Mailing Lists</a>
+<a href="./svnindex.html">SVN Repositories</a>
 </li>
 <li>
-<a href="http://jakarta.apache.org/site/library.html";>Reference Library</a>
+<a href="./lists.html">Mailing Lists</a>
 </li>
 </ul>
 <p>
@@ -139,16 +120,22 @@
 </p>
 <ul>
 <li>
-<a href="http://jakarta.apache.org/site/whoweare.html";>Who We Are</a>
+<a href="./whoweare.html">Who We Are</a>
+</li>
+<li>
+<a href="./heritage.html">Heritage</a>
 </li>
 <li>
-<a 
href="http://jakarta.apache.org/site/acknowledgements.html";>Acknowledgements</a>
+<a href="http://www.apache.org";>Apache Home</a>
+</li>
+<li>
+<a href="./resources.html">Resources</a>
 </li>
 <li>
-<a href="http://jakarta.apache.org/site/contact.html";>Contact</a>
+<a href="./contact.html">Contact</a>
 </li>
 <li>
-<a href="http://jakarta.apache.org/site/legal.html";>Legal</a>
+<a href="./legal.html">Legal</a>
 </li>
 </ul>
 </td>

Added: tomcat/site/trunk/docs/whichversion.html
URL: 
http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/whichversion.html?rev=279437&view=auto
==============================================================================
--- tomcat/site/trunk/docs/whichversion.html (added)
+++ tomcat/site/trunk/docs/whichversion.html Wed Sep  7 15:13:19 2005
@@ -0,0 +1,454 @@
+<?xml version="1.0" encoding="iso-8859-1"?>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>

+<html>

+<head>

+<title>Apache Tomcat - Apache Tomcat</title>

+<meta value="Marc A. Saegesser" name="author" />

+<meta value="[EMAIL PROTECTED]" name="email" />

+<meta value="Yoav Shapira" name="author" />

+<meta value="[EMAIL PROTECTED]" name="email" />

+</head>

+<body vlink="#525D76" alink="#525D76" link="#525D76" text="#000000" 
bgcolor="#ffffff">

+<table cellspacing="0" width="100%" border="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" />

+</a>

+</td>

+<td>

+<font face="arial,helvetica,sanserif">

+<h1>Apache Tomcat</h1>

+</font>

+</td>

+<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"; />

+</a>

+</td>

+</tr>

+</table>

+<table cellspacing="4" width="100%" border="0">

+<!--HEADER SEPARATOR-->

+<tr>

+<td colspan="2">

+<hr size="1" noshade="" />

+</td>

+</tr>

+<tr>

+<!--LEFT SIDE NAVIGATION-->

+<td nowrap="true" valign="top" width="20%">

+<p>

+<strong>Apache Tomcat</strong>

+</p>

+<ul>

+<li>

+<a href="./index.html">Home</a>

+</li>

+</ul>

+<p>

+<strong>Download</strong>

+</p>

+<ul>

+<li>

+<a href="./whichversion.html">Which version?</a>

+</li>

+<li>

+<a href="./download-55.cgi">Apache Tomcat 5.5</a>

+</li>

+<li>

+<a href="./download-41.cgi">Apache Tomcat 4.1</a>

+</li>

+<li>

+<a href="./download-33.cgi">Apache Tomcat 3.3</a>

+</li>

+<li>

+<a href="http://archive.apache.org/dist/";>Archives</a>

+</li>

+</ul>

+<p>

+<strong>Problems?</strong>

+</p>

+<ul>

+<li>

+<a href="./findhelp.html">Find help</a>

+</li>

+<li>

+<a href="./faq/">FAQ</a>

+</li>

+<li>

+<a href="./mail.html">Mailing Lists</a>

+</li>

+<li>

+<a href="./bugreport.html">Bug Database</a>

+</li>

+<li>

+<a href="./irc.html">IRC</a>

+</li>

+</ul>

+<p>

+<strong>Documentation</strong>

+</p>

+<ul>

+<li>

+<a href="./tomcat-5.5-doc/index.html">Apache Tomcat 5.5</a>

+</li>

+<li>

+<a href="./tomcat-4.1-doc/index.html">Apache Tomcat 4.1</a>

+</li>

+<li>

+<a href="./tomcat-3.3-doc/index.html">Apache Tomcat 3.3</a>

+</li>

+</ul>

+<p>

+<strong>Get Involved</strong>

+</p>

+<ul>

+<li>

+<a href="./getinvolved.html">Overview</a>

+</li>

+<li>

+<a href="./svnindex.html">SVN Repositories</a>

+</li>

+<li>

+<a href="./lists.html">Mailing Lists</a>

+</li>

+</ul>

+<p>

+<strong>Misc</strong>

+</p>

+<ul>

+<li>

+<a href="./whoweare.html">Who We Are</a>

+</li>

+<li>

+<a href="./heritage.html">Heritage</a>

+</li>

+<li>

+<a href="http://www.apache.org";>Apache Home</a>

+</li>

+<li>

+<a href="./resources.html">Resources</a>

+</li>

+<li>

+<a href="./contact.html">Contact</a>

+</li>

+<li>

+<a href="./legal.html">Legal</a>

+</li>

+</ul>

+</td>

+<!--RIGHT SIDE MAIN BODY-->

+<td align="left" valign="top" width="80%">

+<table width="100%" cellpadding="2" cellspacing="0" border="0">

+<tr>

+<td bgcolor="#525D76">

+<font face="arial,helvetica,sanserif" color="#ffffff">

+<a name="Apache Tomcat Versions">

+<strong>Apache Tomcat Versions</strong>

+</a>

+</font>

+</td>

+</tr>

+<tr>

+<td>

+<p>

+<blockquote>

+<p>Different versions of Apache Tomcat are available for different versions

+of the Servlet and JSP specifications. The mapping between the specifications

+and the respective Apache Tomcat verisons is:</p>

+

+<table class="detail-table">

+

+<tr>

+  <td valign="top" bgcolor="#039acc">

+<font face="arial,helvetica,sanserif" size="-1" color="#000000">

+<strong>Servlet/JSP Spec</strong>

+</font>

+</td>

+  <td valign="top" bgcolor="#039acc">

+<font face="arial,helvetica,sanserif" size="-1" color="#000000">

+<strong>Apache Tomcat version</strong>

+</font>

+</td>

+</tr>

+

+<tr>

+  <td align="left" valign="top" bgcolor="#a0ddf0">

+<font face="arial,helvetica,sanserif" size="-1" color="#000000">2.4/2.0</font>

+</td>

+  <td align="left" valign="top" bgcolor="#a0ddf0">

+<font face="arial,helvetica,sanserif" size="-1" color="#000000">5.5.x</font>

+</td>

+</tr>

+

+<tr>

+  <td align="left" valign="top" bgcolor="#a0ddf0">

+<font face="arial,helvetica,sanserif" size="-1" color="#000000">2.3/1.2</font>

+</td>

+  <td align="left" valign="top" bgcolor="#a0ddf0">

+<font face="arial,helvetica,sanserif" size="-1" color="#000000">4.1.x</font>

+</td>

+</tr>

+

+<tr>

+  <td align="left" valign="top" bgcolor="#a0ddf0">

+<font face="arial,helvetica,sanserif" size="-1" color="#000000">2.2/1.1</font>

+</td>

+  <td align="left" valign="top" bgcolor="#a0ddf0">

+<font face="arial,helvetica,sanserif" size="-1" color="#000000">3.3.x</font>

+</td>

+</tr>

+

+</table>

+

+<p>The releases are described in more detail below to help you determine 

+which one is right for you.  More details about each release can be found in 

+the associated release notes.</p> 

+

+<p>Please note that alhough we offer downloads and documentation of older

+releases, such as Apache Tomcat 3.x and 4.x, we strongly encourage users to 
use the

+latest stable version of Apache Tomcat whenever possible.  We recognize that 
upgrading

+across major version may not be a trivial task, and some support is still

+offered on the mailing list for users of old versions.  However, because of the

+community-driven support approach, the older your version the less people would

+be interested or able to support you.

+</p>

+

+</blockquote>

+</p>

+</td>

+</tr>

+<tr>

+<td>

+<br />

+</td>

+</tr>

+</table>

+<table width="100%" cellpadding="2" cellspacing="0" border="0">

+<tr>

+<td bgcolor="#525D76">

+<font face="arial,helvetica,sanserif" color="#ffffff">

+<a name="Apache Tomcat 5.x">

+<strong>Apache Tomcat 5.x</strong>

+</a>

+</font>

+</td>

+</tr>

+<tr>

+<td>

+<p>

+<blockquote>

+

+<p>

+<strong>Apache Tomcat 5.5.x</strong>.  Apache Tomcat 5.5 is the current focus 
of

+development.  While it supports the same Servlet and JSP

+Specification versions as Apache Tomcat 5.0.x, there are significant changes

+in many areas under the hood, resulting in improved performance, stability,

+and total cost of ownership.  Please refer to the Apache Tomcat 5.5 Changelog

+for details.

+</p>

+

+<p>

+<strong>Apache Tomcat 5.0.x</strong>.  Apache Tomcat 5.0 improves on Apache 
Tomcat 4.1 in many

+ways, including:

+<ul>

+<li>Performance optimizations and reduced garbage collection</li>

+<li>Refactored application deployer, with an optional standalone deployer 

+allowing validation and compilation of a web application before putting 

+it in production</li>

+<li>Complete server monitoring using JMX and the manager web application</li>

+<li>Scalability and reliability enhancements</li>

+<li>Improved Taglibs handling, including advanced pooling and tag plugins</li>

+<li>Improved platform integration, with native Windows and Unix wrappers</li>

+<li>Embedding using JMX</li>

+<li>Enhanced Security Manager support</li>

+<li>Integrated session clustering</li>

+<li>Expanded documentation</li>

+</ul>

+</p>

+

+</blockquote>

+</p>

+</td>

+</tr>

+<tr>

+<td>

+<br />

+</td>

+</tr>

+</table>

+<table width="100%" cellpadding="2" cellspacing="0" border="0">

+<tr>

+<td bgcolor="#525D76">

+<font face="arial,helvetica,sanserif" color="#ffffff">

+<a name="Apache Tomcat 4.x">

+<strong>Apache Tomcat 4.x</strong>

+</a>

+</font>

+</td>

+</tr>

+<tr>

+<td>

+<p>

+<blockquote>

+

+<p>

+<strong>Apache Tomcat 4.x</strong> implements a new servlet container (called

+Catalina) that is based on completely new architecture.  The 4.x releases

+implement the <strong>Servlet 2.3</strong> and <strong>JSP 1.2</strong>

+specifications.</p>

+

+<p>

+<strong>We encourage all users to upgrade to Apache Tomcat 5.x whenever

+possible.</strong>

+</p>

+

+<p>

+<strong>Apache Tomcat 4.1.x</strong>. Apache Tomcat 4.1 is a refactoring 

+of Apache Tomcat 4.0.x, and contains significant enhancements, including:

+<ul>

+<li>JMX based administration features</li>

+<li>JSP and Struts based administration web application</li>

+<li>New Coyote connector (HTTP/1.1, AJP 1.3 and JNI support)</li>

+<li>Rewritten Jasper JSP page compiler</li>

+<li>Performance and memory efficiency improvements</li>

+<li>Enhanced manager application support for integration with development 

+tools</li>

+<li>Custom Ant tasks to interact with the manager application directly 

+from build.xml scripts</li>

+</ul>

+</p>

+

+<p>

+<strong>Apache Tomcat 4.0.x</strong>.  Apache Tomcat 4.0.6 is the old 
production

+quality release.  The 4.0 servlet

+container (Catalina) has been developed from the ground up for flexibility and

+performance.  Version 4.0 implements the final released versions of the Servlet

+2.3 and JSP 1.2 specifications.  As required by the specifications, Apache 
Tomcat 4.0

+also supports web applications built for the Servlet 2.2 and JSP 1.1

+specifications with no changes.</p>

+

+<p>

+<strong>We encourage all users to upgrade to Apache Tomcat 5.x whenever

+possible.</strong>

+</p>

+

+</blockquote>

+</p>

+</td>

+</tr>

+<tr>

+<td>

+<br />

+</td>

+</tr>

+</table>

+<table width="100%" cellpadding="2" cellspacing="0" border="0">

+<tr>

+<td bgcolor="#525D76">

+<font face="arial,helvetica,sanserif" color="#ffffff">

+<a name="Apache Tomcat 3.x">

+<strong>Apache Tomcat 3.x</strong>

+</a>

+</font>

+</td>

+</tr>

+<tr>

+<td>

+<p>

+<blockquote>

+

+<p>There are several versions of <strong>Apache Tomcat 3.x</strong> currently

+available for download:</p>

+

+<ul>

+<li>Version <strong>3.3</strong> is the current production quality release for

+the Servlet 2.2 and JSP 1.1 specifications.  Apache Tomcat 3.3 is the latest

+continuation of the Apache Tomcat 3.x architecture and it is more advanced 
then 3.2.4,

+which is the 'old' production quality release.</li>

+<li>Version 3.2.4 is the 'old' production quality release and is now in

+maintenance only mode.</li>

+<li>Version 3.1.1 is a legacy release.</li>

+</ul>

+

+<p>

+All <strong>Apache Tomcat 3.x</strong> releases trace their heritage back to 
the

+original Servlet and JSP implementations that Sun donated to the Apache

+Software Foundation.  The 3.x versions all implement the <strong>Servlet

+2.2</strong> and <strong>JSP 1.1</strong> specifications.

+</p>

+

+<p>

+<strong>Apache Tomcat 3.3.x</strong>. Version 3.3.2 is the current production 

+quality release. It continues the refactoring that was begun in version 3.2 and

+carries it to its logical conclusion.  Version 3.3 provides a much more modular

+design and allows the servlet container to be customized by adding and removing

+modules that control the processing of servlet requests.  This version also

+contains many performance improvements.</p> 

+

+<p>

+<strong>Apache Tomcat 3.2.x</strong>.  Version 3.2 added few new features 

+since 3.1; the major effort was a refactoring of the internals to improve 

+performance and stability.  The 3.2.1 release, like 3.1.1, was a security 

+patch.  Version 3.2.2 fixed a large number of bugs and all known 

+specification compliance issues.  Version 3.2.3 was a security update that 

+closes a serious security hole.  Version 3.2.4 is a minor bug fix release.  

+All users of Apache Tomcat versions prior to 3.2.3 should updgrade as soon as 

+possible.  With the exception of fixes for critical security related bugs, 

+development on the Apache Tomcat 3.2.x branch has stopped.</p> 

+

+<p>

+<strong>Apache Tomcat 3.1.x</strong>.  The 3.1 release contained several 

+improvements over Apache Tomcat 3.0, including servlet reloading, WAR file 

+support and added connectors for the IIS and Netscape web servers.  The 

+latest maintenance release, 3.1.1, contained fixes for security problems.  

+There is no active development ongoing for Apache Tomcat 3.1.x.  Users of 
Apache Tomcat 

+3.1 should update to 3.1.1 to close the security holes and they are 

+strongly encouraged to migrate to the current production release, Apache 
Tomcat 

+3.3.</p> 

+

+<p>

+<strong>Apache Tomcat 3.0.x</strong>. Initial Apache Tomcat release.</p>

+

+<p>

+<strong>We encourage all users to upgrade to Apache Tomcat 5.x whenever

+possible.</strong>

+</p>

+

+</blockquote>

+</p>

+</td>

+</tr>

+<tr>

+<td>

+<br />

+</td>

+</tr>

+</table>

+</td>

+</tr>

+<!--FOOTER SEPARATOR-->

+<tr>

+<td colspan="2">

+<hr size="1" noshade="" />

+</td>

+</tr>

+<!--PAGE FOOTER-->

+<tr>

+<td colspan="2">

+<div align="center">

+<font size="-1" color="#525D76">

+<em>

+        Copyright © 1999-2005, The Apache Software Foundation

+        </em>

+</font>

+</div>

+</td>

+</tr>

+</table>

+</body>

+</html>


Added: tomcat/site/trunk/docs/whoweare.html
URL: 
http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/whoweare.html?rev=279437&view=auto
==============================================================================
--- tomcat/site/trunk/docs/whoweare.html (added)
+++ tomcat/site/trunk/docs/whoweare.html Wed Sep  7 15:13:19 2005
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="iso-8859-1"?>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>

+<html>

+<head>

+<title>Apache Tomcat - Apache Tomcat</title>

+</head>

+<body vlink="#525D76" alink="#525D76" link="#525D76" text="#000000" 
bgcolor="#ffffff">

+<table cellspacing="0" width="100%" border="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" />

+</a>

+</td>

+<td>

+<font face="arial,helvetica,sanserif">

+<h1>Apache Tomcat</h1>

+</font>

+</td>

+<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"; />

+</a>

+</td>

+</tr>

+</table>

+<table cellspacing="4" width="100%" border="0">

+<!--HEADER SEPARATOR-->

+<tr>

+<td colspan="2">

+<hr size="1" noshade="" />

+</td>

+</tr>

+<tr>

+<!--LEFT SIDE NAVIGATION-->

+<td nowrap="true" valign="top" width="20%">

+<p>

+<strong>Apache Tomcat</strong>

+</p>

+<ul>

+<li>

+<a href="./index.html">Home</a>

+</li>

+</ul>

+<p>

+<strong>Download</strong>

+</p>

+<ul>

+<li>

+<a href="./whichversion.html">Which version?</a>

+</li>

+<li>

+<a href="./download-55.cgi">Apache Tomcat 5.5</a>

+</li>

+<li>

+<a href="./download-41.cgi">Apache Tomcat 4.1</a>

+</li>

+<li>

+<a href="./download-33.cgi">Apache Tomcat 3.3</a>

+</li>

+<li>

+<a href="http://archive.apache.org/dist/";>Archives</a>

+</li>

+</ul>

+<p>

+<strong>Problems?</strong>

+</p>

+<ul>

+<li>

+<a href="./findhelp.html">Find help</a>

+</li>

+<li>

+<a href="./faq/">FAQ</a>

+</li>

+<li>

+<a href="./mail.html">Mailing Lists</a>

+</li>

+<li>

+<a href="./bugreport.html">Bug Database</a>

+</li>

+<li>

+<a href="./irc.html">IRC</a>

+</li>

+</ul>

+<p>

+<strong>Documentation</strong>

+</p>

+<ul>

+<li>

+<a href="./tomcat-5.5-doc/index.html">Apache Tomcat 5.5</a>

+</li>

+<li>

+<a href="./tomcat-4.1-doc/index.html">Apache Tomcat 4.1</a>

+</li>

+<li>

+<a href="./tomcat-3.3-doc/index.html">Apache Tomcat 3.3</a>

+</li>

+</ul>

+<p>

+<strong>Get Involved</strong>

+</p>

+<ul>

+<li>

+<a href="./getinvolved.html">Overview</a>

+</li>

+<li>

+<a href="./svnindex.html">SVN Repositories</a>

+</li>

+<li>

+<a href="./lists.html">Mailing Lists</a>

+</li>

+</ul>

+<p>

+<strong>Misc</strong>

+</p>

+<ul>

+<li>

+<a href="./whoweare.html">Who We Are</a>

+</li>

+<li>

+<a href="./heritage.html">Heritage</a>

+</li>

+<li>

+<a href="http://www.apache.org";>Apache Home</a>

+</li>

+<li>

+<a href="./resources.html">Resources</a>

+</li>

+<li>

+<a href="./contact.html">Contact</a>

+</li>

+<li>

+<a href="./legal.html">Legal</a>

+</li>

+</ul>

+</td>

+<!--RIGHT SIDE MAIN BODY-->

+<td align="left" valign="top" width="80%">

+<table width="100%" cellpadding="2" cellspacing="0" border="0">

+<tr>

+<td bgcolor="#525D76">

+<font face="arial,helvetica,sanserif" color="#ffffff">

+<a name="TODO">

+<strong>TODO</strong>

+</a>

+</font>

+</td>

+</tr>

+<tr>

+<td>

+<p>

+<blockquote>

+<p>List of members of PMC and roles (eg Chair) if any.</p>

+<p>Short bios of the committers if they want to add one.</p>

+

+</blockquote>

+</p>

+</td>

+</tr>

+<tr>

+<td>

+<br />

+</td>

+</tr>

+</table>

+</td>

+</tr>

+<!--FOOTER SEPARATOR-->

+<tr>

+<td colspan="2">

+<hr size="1" noshade="" />

+</td>

+</tr>

+<!--PAGE FOOTER-->

+<tr>

+<td colspan="2">

+<div align="center">

+<font size="-1" color="#525D76">

+<em>

+        Copyright © 1999-2005, The Apache Software Foundation

+        </em>

+</font>

+</div>

+</td>

+</tr>

+</table>

+</body>

+</html>




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to