Author: jfclere
Date: Tue Nov 3 01:16:58 2009
New Revision: 832241
URL: http://svn.apache.org/viewvc?rev=832241&view=rev
Log:
Arrange the index page.
Added:
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/xdocs/oldnews.xml
Modified:
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/whichversion.xml
Modified: tomcat/site/trunk/docs/index.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=832241&r1=832240&r2=832241&view=diff
==============================================================================
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Tue Nov 3 01:16:58 2009
@@ -259,8 +259,8 @@
<tr>
<td bgcolor="#525D76">
<font face="arial,helvetica,sanserif" color="#ffffff">
-<a name="Live Video Streaming of Tomcat Talks at ApacheCon Europe 2009">
-<strong>Live Video Streaming of Tomcat Talks at ApacheCon Europe 2009</strong>
+<a name="Upcoming: Free Meetup in Oakland">
+<strong>Upcoming: Free Meetup in Oakland</strong>
</a>
</font>
</td>
@@ -269,24 +269,13 @@
<td>
<p>
<blockquote>
-<img
src="http://eu.apachecon.com/page_attachments/0000/0188/Live_Video_v2.gif";
alt="[Live Video Streaming at ApacheCon]" align="right" />
- <p>ApacheCon Europe 2009, 23-27 March in Amsterdam, has a dedicated
- track about Tomcat topics.
- If you cannot make it to Amsterdam this time, you can
- <a href="http://www.eu.apachecon.com/c/aceu2009/about/videoStreaming";>watch
- all Tomcat talks online</a>.</p>
- <p>In addition to the various keynote sessions, and other technical talks,
- the following talks related to Tomcat will be streamed on Thursday,
- the 26th of March.
- </p>
-<ul>
-<li>Securing Apache Tomcat for your Environment (Mark Thomas)</li>
-<li>What's new in Servlet 3.0 (Filip Hanik)</li>
-<li>Performance Tuning Apache Tomcat for Production (Filip Hanik)</li>
-<li>mod_proxy versus mod_jk (Jean-Frederic Clere)</li>
-<li>Introduction to NIO2 (Jean-Francois Arcand)</li>
-<li>What is Bayeux? (Filip Hanik)</li>
-</ul>
+<p>During the ApacheCon a
+<a href="http://wiki.apache.org/tomcat/TomcatAtApacheConUs2009";>Tomcat
meetup</a>
+is organised
+</p>
+<p>On Monday 3th of November at 20:00 <a
href="http://spreadsheets.google.com/viewform?formkey=dEJLcHk3c1ZrRm8tWUNYeXZZckN0Vnc6MA";>register
for it</a>
+and join us in Oakland at the <a
href="http://www.us.apachecon.com/c/acus2009/";>ApacheCon location.</a>
+</p>
</blockquote>
</p>
</td>
@@ -301,8 +290,8 @@
<tr>
<td bgcolor="#525D76">
<font face="arial,helvetica,sanserif" color="#ffffff">
-<a name="Apache Tomcat Versions">
-<strong>Apache Tomcat Versions</strong>
+<a name="old news">
+<strong>old news</strong>
</a>
</font>
</td>
@@ -311,76 +300,9 @@
<td>
<p>
<blockquote>
-<p>For the impatient, current Apache Tomcat production quality releases vs.
-Servlet/JSP specifications:</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.5/2.1</font>
-</td>
- <td align="left" valign="top" bgcolor="#a0ddf0">
-<font face="arial,helvetica,sanserif" size="-1" color="#000000">6.0.20</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.28</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.40</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.2
(archived)</font>
-</td>
-</tr>
-
-</table>
-
-<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 although we offer downloads and documentation of older
-releases we strongly encourage users to use the latest stable version of Apache
-Tomcat whenever possible. We recognize that upgrading
-across major versions 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. The
-<a href="http://wiki.apache.org/tomcat/TomcatVersions";>current status of all
-Tomcat versions</a> is maintained on the wiki.
+<p>
+ See <a href="oldnews.html"> former announcements</a>
</p>
-
</blockquote>
</p>
</td>
Added: tomcat/site/trunk/docs/oldnews.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews.html?rev=832241&view=auto
==============================================================================
--- tomcat/site/trunk/docs/oldnews.html (added)
+++ tomcat/site/trunk/docs/oldnews.html Tue Nov 3 01:16:58 2009
@@ -0,0 +1,250 @@
+<?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 - Old news!</title>
+<meta content="Apache Tomcat Project" name="author" />
+<link rel="stylesheet" href="stylesheets/tomcat.css" type="text/css" />
+<link media="print" rel="stylesheet" href="stylesheets/tomcat-printer.css"
type="text/css" />
+</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/tomcat10.jpg" />
+</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>
+<div class="searchbox noPrint">
+<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 cellspacing="4" width="100%" border="0">
+<!--HEADER SEPARATOR-->
+<tr>
+<td colspan="2">
+<hr size="1" noshade="" />
+</td>
+</tr>
+<tr>
+<!--LEFT SIDE NAVIGATION-->
+<td class="noPrint" nowrap="true" valign="top" width="20%">
+<p>
+<strong>Apache Tomcat</strong>
+</p>
+<ul>
+<li>
+<a href="./index.html">Home</a>
+</li>
+<li>
+<a href="./taglibs/">Taglibs</a>
+</li>
+</ul>
+<p>
+<strong>Download</strong>
+</p>
+<ul>
+<li>
+<a href="./whichversion.html">Which version?</a>
+</li>
+<li>
+<a href="./download-60.cgi">Tomcat 6.x</a>
+</li>
+<li>
+<a href="./download-55.cgi">Tomcat 5.5</a>
+</li>
+<li>
+<a href="./download-41.cgi">Tomcat 4.1</a>
+</li>
+<li>
+<a href="./download-connectors.cgi">Tomcat Connectors</a>
+</li>
+<li>
+<a href="./download-native.cgi">Tomcat Native</a>
+</li>
+<li>
+<a href="http://archive.apache.org/dist/tomcat";>Archives</a>
+</li>
+</ul>
+<p>
+<strong>Documentation</strong>
+</p>
+<ul>
+<li>
+<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
+</li>
+<li>
+<a href="./tomcat-5.5-doc/index.html">Tomcat 5.5</a>
+</li>
+<li>
+<a href="./tomcat-4.1-doc/index.html">Tomcat 4.1</a>
+</li>
+<li>
+<a href="./connectors-doc">Tomcat Connectors</a>
+</li>
+<li>
+<a href="./native-doc">Tomcat Native</a>
+</li>
+<li>
+<a href="./migration.html">Migration Guide</a>
+</li>
+</ul>
+<p>
+<strong>Problems?</strong>
+</p>
+<ul>
+<li>
+<a href="./security.html">Security Reports</a>
+</li>
+<li>
+<a href="./findhelp.html">Find help</a>
+</li>
+<li>
+<a href="http://wiki.apache.org/tomcat/FAQ";>FAQ</a>
+</li>
+<li>
+<a href="./lists.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>Get Involved</strong>
+</p>
+<ul>
+<li>
+<a href="./getinvolved.html">Overview</a>
+</li>
+<li>
+<a href="./svn.html">SVN Repositories</a>
+</li>
+<li>
+<a href="./lists.html">Mailing Lists</a>
+</li>
+<li>
+<a href="http://wiki.apache.org/tomcat";>Wiki</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>
+<li>
+<a href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a>
+</li>
+<li>
+<a href="http://www.apache.org/foundation/thanks.html";>Thanks</a>
+</li>
+</ul>
+</td>
+<!--RIGHT SIDE MAIN BODY-->
+<td id="mainBody" 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="Live Video Streaming of Tomcat Talks at ApacheCon Europe 2009">
+<strong>Live Video Streaming of Tomcat Talks at ApacheCon Europe 2009</strong>
+</a>
+</font>
+</td>
+</tr>
+<tr>
+<td>
+<p>
+<blockquote>
+<img
src="http://eu.apachecon.com/page_attachments/0000/0188/Live_Video_v2.gif";
alt="[Live Video Streaming at ApacheCon]" align="right" />
+ <p>ApacheCon Europe 2009, 23-27 March in Amsterdam, has a dedicated
+ track about Tomcat topics.
+ If you cannot make it to Amsterdam this time, you can
+ <a href="http://www.eu.apachecon.com/c/aceu2009/about/videoStreaming";>watch
+ all Tomcat talks online</a>.</p>
+ <p>In addition to the various keynote sessions, and other technical talks,
+ the following talks related to Tomcat will be streamed on Thursday,
+ the 26th of March.
+ </p>
+<ul>
+<li>Securing Apache Tomcat for your Environment (Mark Thomas)</li>
+<li>What's new in Servlet 3.0 (Filip Hanik)</li>
+<li>Performance Tuning Apache Tomcat for Production (Filip Hanik)</li>
+<li>mod_proxy versus mod_jk (Jean-Frederic Clere)</li>
+<li>Introduction to NIO2 (Jean-Francois Arcand)</li>
+<li>What is Bayeux? (Filip Hanik)</li>
+</ul>
+</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-2009, The Apache Software Foundation
+ <br />
+ "Apache", the Apache feather, and the Apache Tomcat logo are
+ trademarks of the Apache Software Foundation for our open source
+ software.
+ </em>
+</font>
+</div>
+</td>
+</tr>
+</table>
+</body>
+</html>
Modified: tomcat/site/trunk/docs/whichversion.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=832241&r1=832240&r2=832241&view=diff
==============================================================================
--- tomcat/site/trunk/docs/whichversion.html (original)
+++ tomcat/site/trunk/docs/whichversion.html Tue Nov 3 01:16:58 2009
@@ -3,19 +3,19 @@
<html>
<head>
<title>Apache Tomcat - Which Version Do I Want?</title>
-<meta name="author" content="Marc A. Saegesser"/>
-<meta name="author" content="Yoav Shapira"/>
-<link type="text/css" href="stylesheets/tomcat.css" rel="stylesheet"/>
-<link type="text/css" href="stylesheets/tomcat-printer.css" rel="stylesheet"
media="print"/>
+<meta content="Marc A. Saegesser" name="author" />
+<meta content="Yoav Shapira" name="author" />
+<link rel="stylesheet" href="stylesheets/tomcat.css" type="text/css" />
+<link media="print" rel="stylesheet" href="stylesheets/tomcat-printer.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/tomcat10.jpg" align="left" alt="Tomcat Logo" border="0"/>
+<img border="0" alt="Tomcat Logo" align="left" src="./images/tomcat10.jpg" />
</a>
</td>
<td>
@@ -26,28 +26,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 noPrint">
-<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" class="noPrint">
+<td class="noPrint" nowrap="true" valign="top" width="20%">
<p>
<strong>Apache Tomcat</strong>
</p>
@@ -179,11 +179,11 @@
</ul>
</td>
<!--RIGHT SIDE MAIN BODY-->
-<td width="80%" valign="top" align="left" id="mainBody">
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
+<td id="mainBody" 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>
@@ -201,51 +201,68 @@
<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>
+ <td valign="top" bgcolor="#039acc">
+<font face="arial,helvetica,sanserif" size="-1" color="#000000">
+<strong>Actual release revision</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 align="left" valign="top" bgcolor="#a0ddf0">
+<font face="arial,helvetica,sanserif" size="-1" color="#000000">6.0.x</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.20</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>
+ <td align="left" valign="top" bgcolor="#a0ddf0">
+<font face="arial,helvetica,sanserif" size="-1" color="#000000">5.5.28</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 align="left" valign="top" bgcolor="#a0ddf0">
+<font face="arial,helvetica,sanserif" size="-1" color="#000000">4.1.x</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.20</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 align="left" valign="top" bgcolor="#a0ddf0">
+<font face="arial,helvetica,sanserif" size="-1" color="#000000">3.3.x
(archived)</font>
</td>
- <td bgcolor="#a0ddf0" valign="top" align="left">
-<font color="#000000" size="-1" face="arial,helvetica,sanserif">3.3.x
(archived)</font>
+ <td align="left" valign="top" bgcolor="#a0ddf0">
+<font face="arial,helvetica,sanserif" size="-1" color="#000000">3.3.2
(archived)</font>
</td>
</tr>
@@ -270,14 +287,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>
@@ -323,14 +340,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 6.x">
<strong>Apache Tomcat 6.x</strong>
</a>
@@ -360,14 +377,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 5.x">
<strong>Apache Tomcat 5.x</strong>
</a>
@@ -412,14 +429,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>
@@ -468,14 +485,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>
@@ -546,7 +563,7 @@
</tr>
<tr>
<td>
-<br/>
+<br />
</td>
</tr>
</table>
@@ -555,17 +572,17 @@
<!--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-2009, The Apache Software Foundation
- <br/>
+ <br />
"Apache", the Apache feather, and the Apache Tomcat logo are
trademarks of the Apache Software Foundation for our open source
software.
Modified: tomcat/site/trunk/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=832241&r1=832240&r2=832241&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/index.xml (original)
+++ tomcat/site/trunk/xdocs/index.xml Tue Nov 3 01:16:58 2009
@@ -41,75 +41,20 @@
</section>
-<section name="Live Video Streaming of Tomcat Talks at ApacheCon Europe 2009">
-<img src="http://eu.apachecon.com/page_attachments/0000/0188/Live_Video_v2.gif";
- alt="[Live Video Streaming at ApacheCon]" align="right"></img>
- <p>ApacheCon Europe 2009, 23-27 March in Amsterdam, has a dedicated
- track about Tomcat topics.
- If you cannot make it to Amsterdam this time, you can
- <a href="http://www.eu.apachecon.com/c/aceu2009/about/videoStreaming";>watch
- all Tomcat talks online</a>.</p>
- <p>In addition to the various keynote sessions, and other technical talks,
- the following talks related to Tomcat will be streamed on Thursday,
- the 26th of March.
- </p>
-<ul>
-<li>Securing Apache Tomcat for your Environment (Mark Thomas)</li>
-<li>What's new in Servlet 3.0 (Filip Hanik)</li>
-<li>Performance Tuning Apache Tomcat for Production (Filip Hanik)</li>
-<li>mod_proxy versus mod_jk (Jean-Frederic Clere)</li>
-<li>Introduction to NIO2 (Jean-Francois Arcand)</li>
-<li>What is Bayeux? (Filip Hanik)</li>
-</ul>
+<section name="Upcoming: Free Meetup in Oakland">
+<p>During the ApacheCon a
+<a href="http://wiki.apache.org/tomcat/TomcatAtApacheConUs2009";>Tomcat
meetup</a>
+is organised
+</p>
+<p>On Monday 3th of November at 20:00 <a
href="http://spreadsheets.google.com/viewform?formkey=dEJLcHk3c1ZrRm8tWUNYeXZZckN0Vnc6MA";>register
for it</a>
+and join us in Oakland at the <a
href="http://www.us.apachecon.com/c/acus2009/";>ApacheCon location.</a>
+</p>
</section>
-<section name="Apache Tomcat Versions">
-<p>For the impatient, current Apache Tomcat production quality releases vs.
-Servlet/JSP specifications:</p>
-
-<table class="detail-table">
-
-<tr>
- <th><strong>Servlet/JSP Spec</strong></th>
- <th><strong>Apache Tomcat version</strong></th>
-</tr>
-
-<tr>
- <td>2.5/2.1</td>
- <td>6.0.20</td>
-</tr>
-
-<tr>
- <td>2.4/2.0</td>
- <td>5.5.28</td>
-</tr>
-
-<tr>
- <td>2.3/1.2</td>
- <td>4.1.40</td>
-</tr>
-
-<tr>
- <td>2.2/1.1</td>
- <td>3.3.2 (archived)</td>
-</tr>
-
-</table>
-
-<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 although we offer downloads and documentation of older
-releases we strongly encourage users to use the latest stable version of Apache
-Tomcat whenever possible. We recognize that upgrading
-across major versions 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. The
-<a href="http://wiki.apache.org/tomcat/TomcatVersions";>current status of all
-Tomcat versions</a> is maintained on the wiki.
+<section name="old news">
+<p>
+ See <a href="oldnews.html"> former announcements</a>
</p>
-
</section>
</body>
Added: tomcat/site/trunk/xdocs/oldnews.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/oldnews.xml?rev=832241&view=auto
==============================================================================
--- tomcat/site/trunk/xdocs/oldnews.xml (added)
+++ tomcat/site/trunk/xdocs/oldnews.xml Tue Nov 3 01:16:58 2009
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<document>
+
+ <properties>
+ <author>Apache Tomcat Project</author>
+ <title>Old news!</title>
+ </properties>
+
+<body>
+
+<section name="Live Video Streaming of Tomcat Talks at ApacheCon Europe 2009">
+<img src="http://eu.apachecon.com/page_attachments/0000/0188/Live_Video_v2.gif";
+ alt="[Live Video Streaming at ApacheCon]" align="right"></img>
+ <p>ApacheCon Europe 2009, 23-27 March in Amsterdam, has a dedicated
+ track about Tomcat topics.
+ If you cannot make it to Amsterdam this time, you can
+ <a href="http://www.eu.apachecon.com/c/aceu2009/about/videoStreaming";>watch
+ all Tomcat talks online</a>.</p>
+ <p>In addition to the various keynote sessions, and other technical talks,
+ the following talks related to Tomcat will be streamed on Thursday,
+ the 26th of March.
+ </p>
+<ul>
+<li>Securing Apache Tomcat for your Environment (Mark Thomas)</li>
+<li>What's new in Servlet 3.0 (Filip Hanik)</li>
+<li>Performance Tuning Apache Tomcat for Production (Filip Hanik)</li>
+<li>mod_proxy versus mod_jk (Jean-Frederic Clere)</li>
+<li>Introduction to NIO2 (Jean-Francois Arcand)</li>
+<li>What is Bayeux? (Filip Hanik)</li>
+</ul>
+</section>
+
+</body>
+</document>
Modified: tomcat/site/trunk/xdocs/whichversion.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whichversion.xml?rev=832241&r1=832240&r2=832241&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/whichversion.xml (original)
+++ tomcat/site/trunk/xdocs/whichversion.xml Tue Nov 3 01:16:58 2009
@@ -19,26 +19,31 @@
<tr>
<th><strong>Servlet/JSP Spec</strong></th>
<th><strong>Apache Tomcat version</strong></th>
+ <th><strong>Actual release revision</strong></th>
</tr>
<tr>
<td>2.5/2.1</td>
<td>6.0.x</td>
+ <td>6.0.20</td>
</tr>
<tr>
<td>2.4/2.0</td>
<td>5.5.x</td>
+ <td>5.5.28</td>
</tr>
<tr>
<td>2.3/1.2</td>
<td>4.1.x</td>
+ <td>4.1.20</td>
</tr>
<tr>
<td>2.2/1.1</td>
<td>3.3.x (archived)</td>
+ <td>3.3.2 (archived)</td>
</tr>
</table>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
![http://eu.apachecon.com/page_attachments/0000/0188/Live_Video_v2.gif"](http://eu.apachecon.com/page_attachments/0000/0188/Live_Video_v2.gif"){kind=link}
![http://www.apache.org/images/asf-logo.gif"](http://www.apache.org/images/asf-logo.gif"){kind=link}