Author: markt
Date: Fri Oct 22 11:44:03 2010
New Revision: 1026305

URL: http://svn.apache.org/viewvc?rev=1026305&view=rev
Log:
Update for 7.0.4 release

Modified:
    tomcat/site/trunk/docs/download-70.html
    tomcat/site/trunk/docs/index.html
    tomcat/site/trunk/docs/oldnews.html
    tomcat/site/trunk/docs/whichversion.html
    tomcat/site/trunk/xdocs/download-70.xml
    tomcat/site/trunk/xdocs/index.xml
    tomcat/site/trunk/xdocs/oldnews.xml
    tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/docs/download-70.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=1026305&r1=1026304&r2=1026305&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-70.html (original)
+++ tomcat/site/trunk/docs/download-70.html Fri Oct 22 11:44:03 2010
@@ -227,8 +227,8 @@
 <p>
 <blockquote>
         <a href="http://www.apache.org/dist/tomcat/tomcat-7/KEYS";>KEYS</a> |
-        <a href="#7.0.2">7.0.2</a> |
-        <a href="[preferred]/tomcat/tomcat-7/v7.0.2-beta">Browse</a> |
+        <a href="#7.0.4">7.0.4</a> |
+        <a href="[preferred]/tomcat/tomcat-7/v7.0.4-beta">Browse</a> |
         <a href="http://archive.apache.org/dist/tomcat/tomcat-7";>Archives</a>
       </blockquote>
 </p>
@@ -328,11 +328,11 @@
 <tr>
 <td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
-<a name="7.0.2 BETA">
+<a name="7.0.4 BETA">
 <!--()-->
 </a>
-<a name="7.0.2_BETA">
-<strong>7.0.2 BETA</strong>
+<a name="7.0.4_BETA">
+<strong>7.0.4 BETA</strong>
 </a>
 </font>
 </td>
@@ -342,8 +342,8 @@
 <p>
 <blockquote>
       <p>
-      <a name="7.0.2">Please</a> see the 
-      <a href="[preferred]/tomcat/tomcat-7/v7.0.2-beta/README.html">README</a>
+      <a name="7.0.4">Please</a> see the 
+      <a href="[preferred]/tomcat/tomcat-7/v7.0.4-beta/README.html">README</a>
       file for packaging information.  It explains what every distribution 
contains.
       </p>
 
@@ -367,81 +367,81 @@
         <li>Core:
           <ul>
           <li>
-            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2.zip">zip</a>
 
-            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2.zip.asc";>pgp</a>,
 
-            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2.zip.md5";>md5</a>)
+            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4.zip">zip</a>
 
+            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4.zip.asc";>pgp</a>,
 
+            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4.zip.md5";>md5</a>)
           </li>
           <li>
-            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2.tar.gz">tar.gz</a>
 
-            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2.tar.gz.asc";>pgp</a>,
 
-            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2.tar.gz.md5";>md5</a>)
+            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4.tar.gz">tar.gz</a>
 
+            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4.tar.gz.asc";>pgp</a>,
 
+            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4.tar.gz.md5";>md5</a>)
           </li>
           <li>
-            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-windows-x86.zip">32-bit
 Windows zip</a> 
-            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-windows-x86.zip.asc";>pgp</a>,
 
-            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-windows-x86.zip.md5";>md5</a>)
+            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-windows-x86.zip">32-bit
 Windows zip</a> 
+            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-windows-x86.zip.asc";>pgp</a>,
 
+            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-windows-x86.zip.md5";>md5</a>)
           </li>
           <li>
-            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-windows-x64.zip">64-bit
 Windows zip</a> 
-            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-windows-x64.zip.asc";>pgp</a>,
 
-            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-windows-x64.zip.md5";>md5</a>)
+            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-windows-x64.zip">64-bit
 Windows zip</a> 
+            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-windows-x64.zip.asc";>pgp</a>,
 
+            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-windows-x64.zip.md5";>md5</a>)
           </li>
           <li>
-            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-windows-i64.zip">64-bit
 Itanium Windows zip</a> 
-            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-windows-i64.zip.asc";>pgp</a>,
 
-            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-windows-i64.zip.md5";>md5</a>)
+            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-windows-i64.zip">64-bit
 Itanium Windows zip</a> 
+            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-windows-i64.zip.asc";>pgp</a>,
 
+            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-windows-i64.zip.md5";>md5</a>)
           </li>
           <li>
-            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2.exe">32-bit/64-bit
 Windows Service Installer</a> 
-            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2.exe.asc";>pgp</a>,
 
-            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2.exe.md5";>md5</a>)
+            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4.exe">32-bit/64-bit
 Windows Service Installer</a> 
+            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4.exe.asc";>pgp</a>,
 
+            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4.exe.md5";>md5</a>)
           </li>
           </ul>
         </li>
         <li>Full documentation:
           <ul>
           <li>
-            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-fulldocs.tar.gz">tar.gz</a>
 
-            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-fulldocs.tar.gz.asc";>pgp</a>,
 
-            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-fulldocs.tar.gz.md5";>md5</a>)
+            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-fulldocs.tar.gz">tar.gz</a>
 
+            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-fulldocs.tar.gz.asc";>pgp</a>,
 
+            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-fulldocs.tar.gz.md5";>md5</a>)
           </li>
           </ul>
         </li>
         <li>Deployer:
           <ul>
           <li>
-            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-deployer.zip">zip</a>
 
-            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-deployer.zip.asc";>pgp</a>,
  
-            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-deployer.zip.md5";>md5</a>)
+            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-deployer.zip">zip</a>
 
+            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-deployer.zip.asc";>pgp</a>,
  
+            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-deployer.zip.md5";>md5</a>)
           </li>
           <li>
-            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-deployer.tar.gz">tar.gz</a>
 
-            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-deployer.tar.gz.asc";>pgp</a>,
 
-            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-deployer.tar.gz.md5";>md5</a>)
+            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-deployer.tar.gz">tar.gz</a>
 
+            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-deployer.tar.gz.asc";>pgp</a>,
 
+            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-deployer.tar.gz.md5";>md5</a>)
           </li>
           </ul>
         </li>
         <li>Extras:
           <ul>
           <li>
-            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.2-beta/bin/extras/catalina-jmx-remote.jar">JMX
 Remote jar</a> 
-            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/extras/catalina-jmx-remote.jar.asc";>pgp</a>,
 
-            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/extras/catalina-jmx-remote.jar.md5";>md5</a>)
+            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.4-beta/bin/extras/catalina-jmx-remote.jar">JMX
 Remote jar</a> 
+            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/extras/catalina-jmx-remote.jar.asc";>pgp</a>,
 
+            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/extras/catalina-jmx-remote.jar.md5";>md5</a>)
           </li>
           <li>
-            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.2-beta/bin/extras/catalina-ws.jar">Web 
services jar</a> 
-            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/extras/catalina-ws.jar.asc";>pgp</a>,
 
-            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/extras/catalina-ws.jar.md5";>md5</a>)
+            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.4-beta/bin/extras/catalina-ws.jar">Web 
services jar</a> 
+            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/extras/catalina-ws.jar.asc";>pgp</a>,
 
+            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/extras/catalina-ws.jar.md5";>md5</a>)
           </li>
           <li>
-            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.2-beta/bin/extras/tomcat-juli-adapters.jar">JULI
 adapters jar</a> 
-            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/extras/tomcat-juli-adapters.jar.asc";>pgp</a>,
 
-            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/extras/tomcat-juli-adapters.jar.md5";>md5</a>)
+            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.4-beta/bin/extras/tomcat-juli-adapters.jar">JULI
 adapters jar</a> 
+            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/extras/tomcat-juli-adapters.jar.asc";>pgp</a>,
 
+            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/extras/tomcat-juli-adapters.jar.md5";>md5</a>)
           </li>
           <li>
-            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.2-beta/bin/extras/tomcat-juli.jar">JULI 
log4j jar</a> 
-            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/extras/tomcat-juli.jar.asc";>pgp</a>,
 
-            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/extras/tomcat-juli.jar.md5";>md5</a>)
+            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.4-beta/bin/extras/tomcat-juli.jar">JULI 
log4j jar</a> 
+            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/extras/tomcat-juli.jar.asc";>pgp</a>,
 
+            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/extras/tomcat-juli.jar.md5";>md5</a>)
           </li>
           </ul>
         </li>
@@ -476,14 +476,14 @@
 <blockquote>
       <ul>
         <li>
-          <a 
href="[preferred]/tomcat/tomcat-7/v7.0.2-beta/src/apache-tomcat-7.0.2-src.tar.gz">tar.gz</a>
 
-          (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/src/apache-tomcat-7.0.2-src.tar.gz.asc";>pgp</a>,
 
-          <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/src/apache-tomcat-7.0.2-src.tar.gz.md5";>md5</a>)
+          <a 
href="[preferred]/tomcat/tomcat-7/v7.0.4-beta/src/apache-tomcat-7.0.4-src.tar.gz">tar.gz</a>
 
+          (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/src/apache-tomcat-7.0.4-src.tar.gz.asc";>pgp</a>,
 
+          <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/src/apache-tomcat-7.0.4-src.tar.gz.md5";>md5</a>)
         </li>
         <li>
-          <a 
href="[preferred]/tomcat/tomcat-7/v7.0.2-beta/src/apache-tomcat-7.0.2-src.zip">zip</a>
 
-          (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/src/apache-tomcat-7.0.2-src.zip.asc";>pgp</a>,
 
-          <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/src/apache-tomcat-7.0.2-src.zip.md5";>md5</a>)
+          <a 
href="[preferred]/tomcat/tomcat-7/v7.0.4-beta/src/apache-tomcat-7.0.4-src.zip">zip</a>
 
+          (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/src/apache-tomcat-7.0.4-src.zip.asc";>pgp</a>,
 
+          <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/src/apache-tomcat-7.0.4-src.zip.md5";>md5</a>)
         </li>
       </ul>
       </blockquote>

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1026305&r1=1026304&r2=1026305&view=diff
==============================================================================
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Fri Oct 22 11:44:03 2010
@@ -232,17 +232,17 @@ project logo are trademarks of the Apach
 <tr>
 <td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
-<a name="Tomcat 7.0.2 Released">
+<a name="Tomcat 7.0.4 Released">
 <!--()-->
 </a>
-<a name="Tomcat_7.0.2_Released">
-<strong>Tomcat 7.0.2 Released</strong>
+<a name="Tomcat_7.0.4_Released">
+<strong>Tomcat 7.0.4 Released</strong>
 </a>
 </font>
 </td>
 <td align="right" bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica.sanserif">
-<strong>2010-08-11</strong>
+<strong>2010-10-21</strong>
 </font>
 </td>
 </tr>
@@ -251,15 +251,16 @@ project logo are trademarks of the Apach
 <p>
 <blockquote>
 <p>
-The Apache Tomcat Project is proud to announce the release of version 7.0.2 
beta
+The Apache Tomcat Project is proud to announce the release of version 7.0.4 
beta
 of Apache Tomcat. This version of Apache Tomcat supports the
 Servlet 3.0, JSP 2.2 and EL 2.2 specifications. In addition, it includes
 numerous other improvements such as web application memory leak detection and
 prevention, extensive internal code clean-up and support for including external
-content directly in a web application (aliases).</p>
+content directly in a web application (aliases). This release includes many
+bug fixes over Apache Tomcat 7.0.2.</p>
 <p align="center">
 <a href="download-70.cgi">Download</a> |
-<a href="tomcat-7.0-doc/changelog.html">ChangeLog for 7.0.2</a>
+<a href="tomcat-7.0-doc/changelog.html">ChangeLog for 7.0.4</a>
 </p>
 </blockquote>
 </p>

Modified: tomcat/site/trunk/docs/oldnews.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews.html?rev=1026305&r1=1026304&r2=1026305&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews.html (original)
+++ tomcat/site/trunk/docs/oldnews.html Fri Oct 22 11:44:03 2010
@@ -183,6 +183,49 @@
 <tr>
 <td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
+<a name="Tomcat 7.0.2 Released">
+<!--()-->
+</a>
+<a name="Tomcat_7.0.2_Released">
+<strong>Tomcat 7.0.2 Released</strong>
+</a>
+</font>
+</td>
+<td align="right" bgcolor="#525D76">
+<font color="#ffffff" face="arial,helvetica.sanserif">
+<strong>2010-08-11</strong>
+</font>
+</td>
+</tr>
+<tr>
+<td colspan="2">
+<p>
+<blockquote>
+<p>
+The Apache Tomcat Project is proud to announce the release of version 7.0.2 
beta
+of Apache Tomcat. This version of Apache Tomcat supports the
+Servlet 3.0, JSP 2.2 and EL 2.2 specifications. In addition, it includes
+numerous other improvements such as web application memory leak detection and
+prevention, extensive internal code clean-up and support for including external
+content directly in a web application (aliases).</p>
+<p align="center">
+<a href="download-70.cgi">Download</a> |
+<a href="tomcat-7.0-doc/changelog.html">ChangeLog for 7.0.2</a>
+</p>
+</blockquote>
+</p>
+</td>
+</tr>
+<tr>
+<td>
+<br/>
+</td>
+</tr>
+</table>
+<table border="0" cellspacing="0" cellpadding="2" width="100%">
+<tr>
+<td bgcolor="#525D76">
+<font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="Tomcat 6.0.28 Released">
 <!--()-->
 </a>
@@ -204,9 +247,7 @@
 <p>
 The Apache Tomcat Project is proud to announce the release of version 6.0.28 of
 Apache Tomcat. This release includes many bug fixes and a number of security
-fixes over Apache Tomcat 6.0.26.
-
-</p>
+fixes over Apache Tomcat 6.0.26.</p>
 <p align="center">
 <a href="download-60.cgi">Download</a> |
 <a href="tomcat-6.0-doc/changelog.html">ChangeLog for 6.0.28</a>
@@ -244,9 +285,8 @@ fixes over Apache Tomcat 6.0.26.
 <p>
 <blockquote>
 <p>
-The Apache Tomcat Project is proud to announce the release of version 6.0.26 
of Apache Tomcat.
-This release includes many bug fixes over Apache Tomcat 6.0.24.
-
+The Apache Tomcat Project is proud to announce the release of version 6.0.26 of
+Apache Tomcat. This release includes many bug fixes over Apache Tomcat 6.0.24.
 </p>
 <p align="center">
 <a href="download-60.cgi">Download</a> |
@@ -285,9 +325,8 @@ This release includes many bug fixes ove
 <p>
 <blockquote>
 <p>
-The Apache Tomcat Project is proud to announce the release of version 6.0.24 
of Apache Tomcat.
-This release includes many bugfixes over Apache Tomcat 6.0.20.
-
+The Apache Tomcat Project is proud to announce the release of version 6.0.24 of
+Apache Tomcat. This release includes many bugfixes over Apache Tomcat 6.0.20.
 </p>
 <p align="center">
 <a href="download-60.cgi">Download</a> |

Modified: tomcat/site/trunk/docs/whichversion.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1026305&r1=1026304&r2=1026305&view=diff
==============================================================================
--- tomcat/site/trunk/docs/whichversion.html (original)
+++ tomcat/site/trunk/docs/whichversion.html Fri Oct 22 11:44:03 2010
@@ -236,7 +236,7 @@ mapping between the specifications and t
 <font color="#000000" size="-1" face="arial,helvetica,sanserif">7.0.x</font>
 </td>
   <td bgcolor="#a0ddf0" valign="top" align="left">
-<font color="#000000" size="-1" face="arial,helvetica,sanserif">7.0.2 
(beta)</font>
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">7.0.4 
(beta)</font>
 </td>
   <td bgcolor="#a0ddf0" valign="top" align="left">
 <font color="#000000" size="-1" face="arial,helvetica,sanserif">1.6</font>

Modified: tomcat/site/trunk/xdocs/download-70.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-70.xml?rev=1026305&r1=1026304&r2=1026305&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/download-70.xml (original)
+++ tomcat/site/trunk/xdocs/download-70.xml Fri Oct 22 11:44:03 2010
@@ -15,8 +15,8 @@
       <!-- Begin quick navigation section -->
       <section name="Quick Navigation">
         <a href="http://www.apache.org/dist/tomcat/tomcat-7/KEYS";>KEYS</a> |
-        <a href="#7.0.2">7.0.2</a> |
-        <a href="[preferred]/tomcat/tomcat-7/v7.0.2-beta">Browse</a> |
+        <a href="#7.0.4">7.0.4</a> |
+        <a href="[preferred]/tomcat/tomcat-7/v7.0.4-beta">Browse</a> |
         <a href="http://archive.apache.org/dist/tomcat/tomcat-7";>Archives</a>
       </section>
       <!-- End quick navigation section -->
@@ -56,11 +56,11 @@
   </section>
   <!-- End mirrors section -->
 
-      <!-- Begin 7.0.2 section -->
-      <section name="7.0.2 BETA">
+      <!-- Begin 7.0.4 section -->
+      <section name="7.0.4 BETA">
       <p>
-      <a name="7.0.2">Please</a> see the 
-      <a href="[preferred]/tomcat/tomcat-7/v7.0.2-beta/README.html">README</a>
+      <a name="7.0.4">Please</a> see the 
+      <a href="[preferred]/tomcat/tomcat-7/v7.0.4-beta/README.html">README</a>
       file for packaging information.  It explains what every distribution 
contains.
       </p>
 
@@ -69,107 +69,107 @@
         <li>Core:
           <ul>
           <li>
-            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2.zip">zip</a>
 
-            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2.zip.asc";>pgp</a>,
 
-            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2.zip.md5";>md5</a>)
+            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4.zip">zip</a>
 
+            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4.zip.asc";>pgp</a>,
 
+            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4.zip.md5";>md5</a>)
           </li>
           <li>
-            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2.tar.gz">tar.gz</a>
 
-            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2.tar.gz.asc";>pgp</a>,
 
-            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2.tar.gz.md5";>md5</a>)
+            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4.tar.gz">tar.gz</a>
 
+            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4.tar.gz.asc";>pgp</a>,
 
+            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4.tar.gz.md5";>md5</a>)
           </li>
           <li>
-            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-windows-x86.zip">32-bit
 Windows zip</a> 
-            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-windows-x86.zip.asc";>pgp</a>,
 
-            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-windows-x86.zip.md5";>md5</a>)
+            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-windows-x86.zip">32-bit
 Windows zip</a> 
+            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-windows-x86.zip.asc";>pgp</a>,
 
+            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-windows-x86.zip.md5";>md5</a>)
           </li>
           <li>
-            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-windows-x64.zip">64-bit
 Windows zip</a> 
-            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-windows-x64.zip.asc";>pgp</a>,
 
-            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-windows-x64.zip.md5";>md5</a>)
+            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-windows-x64.zip">64-bit
 Windows zip</a> 
+            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-windows-x64.zip.asc";>pgp</a>,
 
+            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-windows-x64.zip.md5";>md5</a>)
           </li>
           <li>
-            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-windows-i64.zip">64-bit
 Itanium Windows zip</a> 
-            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-windows-i64.zip.asc";>pgp</a>,
 
-            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-windows-i64.zip.md5";>md5</a>)
+            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-windows-i64.zip">64-bit
 Itanium Windows zip</a> 
+            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-windows-i64.zip.asc";>pgp</a>,
 
+            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-windows-i64.zip.md5";>md5</a>)
           </li>
           <li>
-            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2.exe">32-bit/64-bit
 Windows Service Installer</a> 
-            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2.exe.asc";>pgp</a>,
 
-            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2.exe.md5";>md5</a>)
+            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4.exe">32-bit/64-bit
 Windows Service Installer</a> 
+            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4.exe.asc";>pgp</a>,
 
+            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4.exe.md5";>md5</a>)
           </li>
           </ul>
         </li>
         <li>Full documentation:
           <ul>
           <li>
-            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-fulldocs.tar.gz">tar.gz</a>
 
-            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-fulldocs.tar.gz.asc";>pgp</a>,
 
-            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-fulldocs.tar.gz.md5";>md5</a>)
+            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-fulldocs.tar.gz">tar.gz</a>
 
+            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-fulldocs.tar.gz.asc";>pgp</a>,
 
+            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-fulldocs.tar.gz.md5";>md5</a>)
           </li>
           </ul>
         </li>
         <li>Deployer:
           <ul>
           <li>
-            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-deployer.zip">zip</a>
 
-            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-deployer.zip.asc";>pgp</a>,
  
-            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-deployer.zip.md5";>md5</a>)
+            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-deployer.zip">zip</a>
 
+            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-deployer.zip.asc";>pgp</a>,
  
+            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-deployer.zip.md5";>md5</a>)
           </li>
           <li>
-            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-deployer.tar.gz">tar.gz</a>
 
-            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-deployer.tar.gz.asc";>pgp</a>,
 
-            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/apache-tomcat-7.0.2-deployer.tar.gz.md5";>md5</a>)
+            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-deployer.tar.gz">tar.gz</a>
 
+            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-deployer.tar.gz.asc";>pgp</a>,
 
+            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/apache-tomcat-7.0.4-deployer.tar.gz.md5";>md5</a>)
           </li>
           </ul>
         </li>
         <li>Extras:
           <ul>
           <li>
-            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.2-beta/bin/extras/catalina-jmx-remote.jar">JMX
 Remote jar</a> 
-            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/extras/catalina-jmx-remote.jar.asc";>pgp</a>,
 
-            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/extras/catalina-jmx-remote.jar.md5";>md5</a>)
+            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.4-beta/bin/extras/catalina-jmx-remote.jar">JMX
 Remote jar</a> 
+            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/extras/catalina-jmx-remote.jar.asc";>pgp</a>,
 
+            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/extras/catalina-jmx-remote.jar.md5";>md5</a>)
           </li>
           <li>
-            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.2-beta/bin/extras/catalina-ws.jar">Web 
services jar</a> 
-            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/extras/catalina-ws.jar.asc";>pgp</a>,
 
-            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/extras/catalina-ws.jar.md5";>md5</a>)
+            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.4-beta/bin/extras/catalina-ws.jar">Web 
services jar</a> 
+            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/extras/catalina-ws.jar.asc";>pgp</a>,
 
+            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/extras/catalina-ws.jar.md5";>md5</a>)
           </li>
           <li>
-            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.2-beta/bin/extras/tomcat-juli-adapters.jar">JULI
 adapters jar</a> 
-            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/extras/tomcat-juli-adapters.jar.asc";>pgp</a>,
 
-            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/extras/tomcat-juli-adapters.jar.md5";>md5</a>)
+            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.4-beta/bin/extras/tomcat-juli-adapters.jar">JULI
 adapters jar</a> 
+            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/extras/tomcat-juli-adapters.jar.asc";>pgp</a>,
 
+            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/extras/tomcat-juli-adapters.jar.md5";>md5</a>)
           </li>
           <li>
-            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.2-beta/bin/extras/tomcat-juli.jar">JULI 
log4j jar</a> 
-            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/extras/tomcat-juli.jar.asc";>pgp</a>,
 
-            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/bin/extras/tomcat-juli.jar.md5";>md5</a>)
+            <a 
href="[preferred]/tomcat/tomcat-7/v7.0.4-beta/bin/extras/tomcat-juli.jar">JULI 
log4j jar</a> 
+            (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/extras/tomcat-juli.jar.asc";>pgp</a>,
 
+            <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/bin/extras/tomcat-juli.jar.md5";>md5</a>)
           </li>
           </ul>
         </li>
       </ul>
       </subsection>
-      <!-- End of 7.0.2 binary section -->
+      <!-- End of 7.0.4 binary section -->
  
-      <!-- Begin 7.0.2 source section -->
+      <!-- Begin 7.0.4 source section -->
       <subsection name="Source Code Distributions">
       <ul>
         <li>
-          <a 
href="[preferred]/tomcat/tomcat-7/v7.0.2-beta/src/apache-tomcat-7.0.2-src.tar.gz">tar.gz</a>
 
-          (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/src/apache-tomcat-7.0.2-src.tar.gz.asc";>pgp</a>,
 
-          <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/src/apache-tomcat-7.0.2-src.tar.gz.md5";>md5</a>)
+          <a 
href="[preferred]/tomcat/tomcat-7/v7.0.4-beta/src/apache-tomcat-7.0.4-src.tar.gz">tar.gz</a>
 
+          (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/src/apache-tomcat-7.0.4-src.tar.gz.asc";>pgp</a>,
 
+          <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/src/apache-tomcat-7.0.4-src.tar.gz.md5";>md5</a>)
         </li>
         <li>
-          <a 
href="[preferred]/tomcat/tomcat-7/v7.0.2-beta/src/apache-tomcat-7.0.2-src.zip">zip</a>
 
-          (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/src/apache-tomcat-7.0.2-src.zip.asc";>pgp</a>,
 
-          <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.2-beta/src/apache-tomcat-7.0.2-src.zip.md5";>md5</a>)
+          <a 
href="[preferred]/tomcat/tomcat-7/v7.0.4-beta/src/apache-tomcat-7.0.4-src.zip">zip</a>
 
+          (<a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/src/apache-tomcat-7.0.4-src.zip.asc";>pgp</a>,
 
+          <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/v7.0.4-beta/src/apache-tomcat-7.0.4-src.zip.md5";>md5</a>)
         </li>
       </ul>
       </subsection>
-      <!-- End 7.0.2 source section -->
+      <!-- End 7.0.4 source section -->
 
     </section>
-    <!-- End 7.0.2 section -->
+    <!-- End 7.0.4 section -->
 
 </body>
 </document>

Modified: tomcat/site/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1026305&r1=1026304&r2=1026305&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/index.xml (original)
+++ tomcat/site/trunk/xdocs/index.xml Fri Oct 22 11:44:03 2010
@@ -33,17 +33,18 @@ project logo are trademarks of the Apach
 
 </section>
 
-<section name="Tomcat 7.0.2 Released" rtext="2010-08-11">
+<section name="Tomcat 7.0.4 Released" rtext="2010-10-21">
 <p>
-The Apache Tomcat Project is proud to announce the release of version 7.0.2 
beta
+The Apache Tomcat Project is proud to announce the release of version 7.0.4 
beta
 of Apache Tomcat. This version of Apache Tomcat supports the
 Servlet 3.0, JSP 2.2 and EL 2.2 specifications. In addition, it includes
 numerous other improvements such as web application memory leak detection and
 prevention, extensive internal code clean-up and support for including external
-content directly in a web application (aliases).</p>
+content directly in a web application (aliases). This release includes many
+bug fixes over Apache Tomcat 7.0.2.</p>
 <p align="center">
 <a href="download-70.cgi">Download</a> |
-<a href="tomcat-7.0-doc/changelog.html">ChangeLog for 7.0.2</a>
+<a href="tomcat-7.0-doc/changelog.html">ChangeLog for 7.0.4</a>
 </p>
 </section>
 

Modified: tomcat/site/trunk/xdocs/oldnews.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/oldnews.xml?rev=1026305&r1=1026304&r2=1026305&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/oldnews.xml (original)
+++ tomcat/site/trunk/xdocs/oldnews.xml Fri Oct 22 11:44:03 2010
@@ -8,13 +8,25 @@
 
 <body>
 
+<section name="Tomcat 7.0.2 Released" rtext="2010-08-11">
+<p>
+The Apache Tomcat Project is proud to announce the release of version 7.0.2 
beta
+of Apache Tomcat. This version of Apache Tomcat supports the
+Servlet 3.0, JSP 2.2 and EL 2.2 specifications. In addition, it includes
+numerous other improvements such as web application memory leak detection and
+prevention, extensive internal code clean-up and support for including external
+content directly in a web application (aliases).</p>
+<p align="center">
+<a href="download-70.cgi">Download</a> |
+<a href="tomcat-7.0-doc/changelog.html">ChangeLog for 7.0.2</a>
+</p>
+</section>
+
 <section name="Tomcat 6.0.28 Released" rtext="2010-07-09">
 <p>
 The Apache Tomcat Project is proud to announce the release of version 6.0.28 of
 Apache Tomcat. This release includes many bug fixes and a number of security
-fixes over Apache Tomcat 6.0.26.
-
-</p>
+fixes over Apache Tomcat 6.0.26.</p>
 <p align="center">
 <a href="download-60.cgi">Download</a> |
 <a href="tomcat-6.0-doc/changelog.html">ChangeLog for 6.0.28</a>
@@ -23,9 +35,8 @@ fixes over Apache Tomcat 6.0.26.
 
 <section name="Tomcat 6.0.26 Released" rtext="2010-03-11">
 <p>
-The Apache Tomcat Project is proud to announce the release of version 6.0.26 
of Apache Tomcat.
-This release includes many bug fixes over Apache Tomcat 6.0.24.
-
+The Apache Tomcat Project is proud to announce the release of version 6.0.26 of
+Apache Tomcat. This release includes many bug fixes over Apache Tomcat 6.0.24.
 </p>
 <p align="center">
 <a href="download-60.cgi">Download</a> |
@@ -35,9 +46,8 @@ This release includes many bug fixes ove
 
 <section name="Tomcat 6.0.24 Released" rtext="2010-01-21">
 <p>
-The Apache Tomcat Project is proud to announce the release of version 6.0.24 
of Apache Tomcat.
-This release includes many bugfixes over Apache Tomcat 6.0.20.
-
+The Apache Tomcat Project is proud to announce the release of version 6.0.24 of
+Apache Tomcat. This release includes many bugfixes over Apache Tomcat 6.0.20.
 </p>
 <p align="center">
 <a href="download-60.cgi">Download</a> |

Modified: tomcat/site/trunk/xdocs/whichversion.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whichversion.xml?rev=1026305&r1=1026304&r2=1026305&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/whichversion.xml (original)
+++ tomcat/site/trunk/xdocs/whichversion.xml Fri Oct 22 11:44:03 2010
@@ -28,7 +28,7 @@ mapping between the specifications and t
 <tr>
   <td>3.0/2.2</td>
   <td>7.0.x</td>
-  <td>7.0.2 (beta)</td>
+  <td>7.0.4 (beta)</td>
   <td>1.6</td>
 </tr>
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to