Author: funkman
Date: Thu Mar  1 03:49:48 2007
New Revision: 513286

URL: http://svn.apache.org/viewvc?view=rev&rev=513286
Log:
Brief placeholder description about Tomcat 6


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

Modified: tomcat/site/trunk/docs/whichversion.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?view=diff&rev=513286&r1=513285&r2=513286
==============================================================================
--- tomcat/site/trunk/docs/whichversion.html (original)
+++ tomcat/site/trunk/docs/whichversion.html Thu Mar  1 03:49:48 2007
@@ -3,20 +3,20 @@
 <html>
 <head>
 <title>Apache Tomcat - Apache Tomcat -- Which Version Do I Want?</title>
-<meta name="author" value="Marc A. Saegesser"/>
-<meta name="email" value="[EMAIL PROTECTED]"/>
-<meta name="author" value="Yoav Shapira"/>
-<meta name="email" value="[EMAIL PROTECTED]"/>
-<link type="text/css" href="stylesheets/tomcat.css" rel="stylesheet"/>
+<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" />
+<link rel="stylesheet" href="stylesheets/tomcat.css" type="text/css" />
 </head>
-<body bgcolor="#ffffff" text="#000000" link="#525D76" alink="#525D76" 
vlink="#525D76">
-<table border="0" width="100%" cellspacing="0">
+<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 src="./images/tomcat.gif" align="left" alt="Tomcat Logo" border="0"/>
+<img border="0" alt="Tomcat Logo" align="left" src="./images/tomcat.gif" />
 </a>
 </td>
 <td>
@@ -27,28 +27,28 @@
 <td>
 <!--APACHE LOGO-->
 <a href="http://www.apache.org/";>
-<img src="http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache 
Logo" border="0"/>
+<img border="0" alt="Apache Logo" align="right" 
src="http://www.apache.org/images/asf-logo.gif"; />
 </a>
 </td>
 </tr>
 </table>
 <div class="searchbox">
-<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 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>
 </div>
-<table border="0" width="100%" cellspacing="4">
+<table cellspacing="4" width="100%" border="0">
 <!--HEADER SEPARATOR-->
 <tr>
 <td colspan="2">
-<hr noshade="" size="1"/>
+<hr size="1" noshade="" />
 </td>
 </tr>
 <tr>
 <!--LEFT SIDE NAVIGATION-->
-<td width="20%" valign="top" nowrap="true">
+<td nowrap="true" valign="top" width="20%">
 <p>
 <strong>Apache Tomcat</strong>
 </p>
@@ -171,11 +171,11 @@
 </ul>
 </td>
 <!--RIGHT SIDE MAIN BODY-->
-<td width="80%" valign="top" align="left">
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
+<td align="left" valign="top" width="80%">
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
 <tr>
 <td bgcolor="#525D76">
-<font color="#ffffff" face="arial,helvetica,sanserif">
+<font face="arial,helvetica,sanserif" color="#ffffff">
 <a name="Apache Tomcat Versions">
 <strong>Apache Tomcat Versions</strong>
 </a>
@@ -193,59 +193,59 @@
 <table class="detail-table">
 
 <tr>
-  <td bgcolor="#039acc" valign="top">
-<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+  <td valign="top" bgcolor="#039acc">
+<font face="arial,helvetica,sanserif" size="-1" color="#000000">
 <strong>Servlet/JSP Spec</strong>
 </font>
 </td>
-  <td bgcolor="#039acc" valign="top">
-<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+  <td valign="top" bgcolor="#039acc">
+<font face="arial,helvetica,sanserif" size="-1" color="#000000">
 <strong>Apache Tomcat version</strong>
 </font>
 </td>
 </tr>
 
 <tr>
-  <td bgcolor="#a0ddf0" valign="top" align="left">
-<font color="#000000" size="-1" face="arial,helvetica,sanserif">2.5/2.1</font>
+  <td align="left" valign="top" bgcolor="#a0ddf0">
+<font face="arial,helvetica,sanserif" size="-1" color="#000000">2.5/2.1</font>
 </td>
-  <td bgcolor="#a0ddf0" valign="top" align="left">
-<font color="#000000" size="-1" face="arial,helvetica,sanserif">6.0.x</font>
+  <td align="left" valign="top" bgcolor="#a0ddf0">
+<font face="arial,helvetica,sanserif" size="-1" color="#000000">6.0.x</font>
 </td>
 </tr>
 
 <tr>
-  <td bgcolor="#a0ddf0" valign="top" align="left">
-<font color="#000000" size="-1" face="arial,helvetica,sanserif">2.4/2.0</font>
+  <td align="left" valign="top" bgcolor="#a0ddf0">
+<font face="arial,helvetica,sanserif" size="-1" color="#000000">2.4/2.0</font>
 </td>
-  <td bgcolor="#a0ddf0" valign="top" align="left">
-<font color="#000000" size="-1" face="arial,helvetica,sanserif">5.5.x</font>
+  <td align="left" valign="top" bgcolor="#a0ddf0">
+<font face="arial,helvetica,sanserif" size="-1" color="#000000">5.5.x</font>
 </td>
 </tr>
 
 <tr>
-  <td bgcolor="#a0ddf0" valign="top" align="left">
-<font color="#000000" size="-1" face="arial,helvetica,sanserif">2.3/1.2</font>
+  <td align="left" valign="top" bgcolor="#a0ddf0">
+<font face="arial,helvetica,sanserif" size="-1" color="#000000">2.3/1.2</font>
 </td>
-  <td bgcolor="#a0ddf0" valign="top" align="left">
-<font color="#000000" size="-1" face="arial,helvetica,sanserif">4.1.x</font>
+  <td align="left" valign="top" bgcolor="#a0ddf0">
+<font face="arial,helvetica,sanserif" size="-1" color="#000000">4.1.x</font>
 </td>
 </tr>
 
 <tr>
-  <td bgcolor="#a0ddf0" valign="top" align="left">
-<font color="#000000" size="-1" face="arial,helvetica,sanserif">2.2/1.1</font>
+  <td align="left" valign="top" bgcolor="#a0ddf0">
+<font face="arial,helvetica,sanserif" size="-1" color="#000000">2.2/1.1</font>
 </td>
-  <td bgcolor="#a0ddf0" valign="top" align="left">
-<font color="#000000" size="-1" face="arial,helvetica,sanserif">3.3.x</font>
+  <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>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
@@ -262,14 +262,14 @@
 </tr>
 <tr>
 <td>
-<br/>
+<br />
 </td>
 </tr>
 </table>
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
 <tr>
 <td bgcolor="#525D76">
-<font color="#ffffff" face="arial,helvetica,sanserif">
+<font face="arial,helvetica,sanserif" color="#ffffff">
 <a name="Alpha / Beta / Stable">
 <strong>Alpha / Beta / Stable</strong>
 </a>
@@ -311,14 +311,46 @@
 </tr>
 <tr>
 <td>
-<br/>
+<br />
 </td>
 </tr>
 </table>
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
 <tr>
 <td bgcolor="#525D76">
-<font color="#ffffff" face="arial,helvetica,sanserif">
+<font face="arial,helvetica,sanserif" color="#ffffff">
+<a name="Apache Tomcat 6.x">
+<strong>Apache Tomcat 6.x</strong>
+</a>
+</font>
+</td>
+</tr>
+<tr>
+<td>
+<p>
+<blockquote>
+
+<p>
+<strong>Apache Tomcat 6.x</strong>.  Apache Tomcat 6.x is the current focus of
+development.  It builds upon the improvements made in Tomcat 5.5.x and 
implements
+the <strong>Servlet 2.5</strong> and <strong>JSP 2.1</strong>
+specifications.
+</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>
@@ -331,8 +363,7 @@
 <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
+<strong>Apache Tomcat 5.5.x</strong>.  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
@@ -344,8 +375,8 @@
 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 
+<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>
@@ -364,14 +395,14 @@
 </tr>
 <tr>
 <td>
-<br/>
+<br />
 </td>
 </tr>
 </table>
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
 <tr>
 <td bgcolor="#525D76">
-<font color="#ffffff" face="arial,helvetica,sanserif">
+<font face="arial,helvetica,sanserif" color="#ffffff">
 <a name="Apache Tomcat 4.x">
 <strong>Apache Tomcat 4.x</strong>
 </a>
@@ -395,7 +426,7 @@
 </p>
 
 <p>
-<strong>Apache Tomcat 4.1.x</strong>. Apache Tomcat 4.1 is a refactoring 
+<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>
@@ -403,9 +434,9 @@
 <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 
+<li>Enhanced manager application support for integration with development
 tools</li>
-<li>Custom Ant tasks to interact with the manager application directly 
+<li>Custom Ant tasks to interact with the manager application directly
 from build.xml scripts</li>
 </ul>
 </p>
@@ -430,14 +461,14 @@
 </tr>
 <tr>
 <td>
-<br/>
+<br />
 </td>
 </tr>
 </table>
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
 <tr>
 <td bgcolor="#525D76">
-<font color="#ffffff" face="arial,helvetica,sanserif">
+<font face="arial,helvetica,sanserif" color="#ffffff">
 <a name="Apache Tomcat 3.x">
 <strong>Apache Tomcat 3.x</strong>
 </a>
@@ -470,33 +501,33 @@
 </p>
 
 <p>
-<strong>Apache Tomcat 3.3.x</strong>. Version 3.3.2 is the current production 
+<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> 
+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> 
+<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>
@@ -512,7 +543,7 @@
 </tr>
 <tr>
 <td>
-<br/>
+<br />
 </td>
 </tr>
 </table>
@@ -521,14 +552,14 @@
 <!--FOOTER SEPARATOR-->
 <tr>
 <td colspan="2">
-<hr noshade="" size="1"/>
+<hr size="1" noshade="" />
 </td>
 </tr>
 <!--PAGE FOOTER-->
 <tr>
 <td colspan="2">
 <div align="center">
-<font color="#525D76" size="-1">
+<font size="-1" color="#525D76">
 <em>
         Copyright © 1999-2006, The Apache Software Foundation
         </em>

Modified: tomcat/site/trunk/xdocs/whichversion.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whichversion.xml?view=diff&rev=513286&r1=513285&r2=513286
==============================================================================
--- tomcat/site/trunk/xdocs/whichversion.xml (original)
+++ tomcat/site/trunk/xdocs/whichversion.xml Thu Mar  1 03:49:48 2007
@@ -43,9 +43,9 @@
 
 </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>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
@@ -83,10 +83,20 @@
 
 </section>
 
+<section name="Apache Tomcat 6.x">
+
+<p><strong>Apache Tomcat 6.x</strong>.  Apache Tomcat 6.x is the current focus 
of
+development.  It builds upon the improvements made in Tomcat 5.5.x and 
implements
+the <strong>Servlet 2.5</strong> and <strong>JSP 2.1</strong>
+specifications.
+</p>
+
+</section>
+
+
 <section name="Apache Tomcat 5.x">
 
-<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
+<p><strong>Apache Tomcat 5.5.x</strong>.  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
@@ -97,8 +107,8 @@
 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 
+<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>
@@ -123,7 +133,7 @@
 <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 
+<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>
@@ -131,9 +141,9 @@
 <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 
+<li>Enhanced manager application support for integration with development
 tools</li>
-<li>Custom Ant tasks to interact with the manager application directly 
+<li>Custom Ant tasks to interact with the manager application directly
 from build.xml scripts</li>
 </ul>
 </p>
@@ -173,31 +183,31 @@
 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 
+<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> 
+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.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>
 



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

Reply via email to