You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2017/07/28 16:23:12 UTC

svn commit: r1803294 - in /tomcat/site/trunk: docs/ xdocs/ xdocs/stylesheets/

Author: markt
Date: Fri Jul 28 16:23:11 2017
New Revision: 1803294

URL: http://svn.apache.org/viewvc?rev=1803294&view=rev
Log:
Remove the download and doc links for 6.0.x
Remove most of the remaining references to Tomcat 6

Modified:
    tomcat/site/trunk/docs/bugreport.html
    tomcat/site/trunk/docs/ci.html
    tomcat/site/trunk/docs/conference.html
    tomcat/site/trunk/docs/contact.html
    tomcat/site/trunk/docs/download-60.html
    tomcat/site/trunk/docs/download-70.html
    tomcat/site/trunk/docs/download-80.html
    tomcat/site/trunk/docs/download-90.html
    tomcat/site/trunk/docs/download-connectors.html
    tomcat/site/trunk/docs/download-native.html
    tomcat/site/trunk/docs/download-taglibs.html
    tomcat/site/trunk/docs/findhelp.html
    tomcat/site/trunk/docs/getinvolved.html
    tomcat/site/trunk/docs/heritage.html
    tomcat/site/trunk/docs/index.html
    tomcat/site/trunk/docs/irc.html
    tomcat/site/trunk/docs/legal.html
    tomcat/site/trunk/docs/lists.html
    tomcat/site/trunk/docs/maven-plugin.html
    tomcat/site/trunk/docs/migration-6.html
    tomcat/site/trunk/docs/migration-7.html
    tomcat/site/trunk/docs/migration-8.html
    tomcat/site/trunk/docs/migration-85.html
    tomcat/site/trunk/docs/migration-9.html
    tomcat/site/trunk/docs/migration.html
    tomcat/site/trunk/docs/oldnews-2010.html
    tomcat/site/trunk/docs/oldnews-2011.html
    tomcat/site/trunk/docs/oldnews-2012.html
    tomcat/site/trunk/docs/oldnews-2013.html
    tomcat/site/trunk/docs/oldnews-2014.html
    tomcat/site/trunk/docs/oldnews-2015.html
    tomcat/site/trunk/docs/oldnews-2016.html
    tomcat/site/trunk/docs/oldnews.html
    tomcat/site/trunk/docs/presentations.html
    tomcat/site/trunk/docs/resources.html
    tomcat/site/trunk/docs/security-3.html
    tomcat/site/trunk/docs/security-4.html
    tomcat/site/trunk/docs/security-5.html
    tomcat/site/trunk/docs/security-6.html
    tomcat/site/trunk/docs/security-7.html
    tomcat/site/trunk/docs/security-8.html
    tomcat/site/trunk/docs/security-9.html
    tomcat/site/trunk/docs/security-impact.html
    tomcat/site/trunk/docs/security-jk.html
    tomcat/site/trunk/docs/security-native.html
    tomcat/site/trunk/docs/security-taglibs.html
    tomcat/site/trunk/docs/security.html
    tomcat/site/trunk/docs/svn.html
    tomcat/site/trunk/docs/taglibs.html
    tomcat/site/trunk/docs/tomcat-55-eol.html
    tomcat/site/trunk/docs/tomcat-60-eol.html
    tomcat/site/trunk/docs/tomcat-80-eol.html
    tomcat/site/trunk/docs/tools.html
    tomcat/site/trunk/docs/whichversion.html
    tomcat/site/trunk/docs/whoweare.html
    tomcat/site/trunk/xdocs/bugreport.xml
    tomcat/site/trunk/xdocs/migration.xml
    tomcat/site/trunk/xdocs/stylesheets/project.xml
    tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/docs/bugreport.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/bugreport.html (original)
+++ tomcat/site/trunk/docs/bugreport.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>
@@ -466,8 +460,8 @@ problem you are having before reporting
         The same problem should be reported only once, but the fix may
         be applied to different Tomcat versions. While doing so, the bug report
         is moved between different products. A bug that is originally
-        reported against Tomcat 8 is moved to Tomcat 7 and maybe later to
-        Tomcat 6. So it makes sense to search all the versions at once.</p>
+        reported against Tomcat 9 is moved to Tomcat 8 and maybe later to
+        Tomcat 7. So it makes sense to search all the versions at once.</p>
 
         
 <p>Here is a quick list of supported products:</p>
@@ -475,8 +469,8 @@ problem you are having before reporting
 <ul>
          
 <li>
-<b>Tomcat 9</b>, <b>Tomcat 8</b>, <b>Tomcat 7</b> and
-         <b>Tomcat 6</b> &ndash; Tomcat 9.0.x, 8.5.x or 8.0.x, 7.0.x and 6.0.x</li>
+<b>Tomcat 9</b>, <b>Tomcat 8</b> and <b>Tomcat 7</b>
+             &ndash; Tomcat 9.0.x, 8.5.x or 8.0.x and 7.0.x</li>
          
 <li>
 <b>Tomcat Connectors</b> &ndash; Integration of Tomcat with other Web servers</li>
@@ -559,16 +553,6 @@ problem you are having before reporting
           See <a href="ci.html">Buildbot</a> page for details.</p>
       
 </li>
-      
-<li>
-<p>STATUS file for Tomcat 6</p>
-        
-<p>A STATUS file is used in Review-Then-Commit development process to
-          propose and then vote for the proposed patches. These are available
-          in the source code of versions of Tomcat that use Review-Than-Commit.
-          Currently only Tomcat 6 uses this development model.</p>
-      
-</li>
     
 </ul>
 
@@ -583,7 +567,6 @@ problem you are having before reporting
 <th><strong>Product</strong></th>
       <th><strong>Changelog (released)</strong></th>
       <th><strong>Changelog (unreleased)</strong></th>
-      <th><strong>STATUS</strong></th>
     
 </tr>
 
@@ -597,7 +580,6 @@ problem you are having before reporting
       <td>
         <a href="http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml">changelog.xml</a>
       </td>
-      <td><i>none</i></td>
     
 </tr>
 
@@ -611,7 +593,6 @@ problem you are having before reporting
       <td>
         <a href="http://svn.apache.org/repos/asf/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml">changelog.xml</a>
       </td>
-      <td><i>none</i></td>
     
 </tr>
 
@@ -625,7 +606,6 @@ problem you are having before reporting
       <td>
         <a href="http://svn.apache.org/repos/asf/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml">changelog.xml</a>
       </td>
-      <td><i>none</i></td>
     
 </tr>
 
@@ -639,23 +619,6 @@ problem you are having before reporting
       <td>
         <a href="http://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml">changelog.xml</a>
       </td>
-      <td><i>none</i></td>
-    
-</tr>
-
-    
-<tr>
-      
-<td>Tomcat 6.0</td>
-      <td>
-        <a href="http://tomcat.apache.org/tomcat-6.0-doc/changelog.html">changelog.html</a>
-      </td>
-      <td>
-        <a href="http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml">changelog.xml</a>
-      </td>
-      <td>
-        <a href="http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?view=markup">STATUS.txt</a>
-      </td>
     
 </tr>
 
@@ -669,7 +632,6 @@ problem you are having before reporting
       <td>
         <a href="http://svn.apache.org/repos/asf/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml">changelog.xml</a>
       </td>
-      <td><i>none</i></td>
     
 </tr>
 
@@ -683,7 +645,6 @@ problem you are having before reporting
       <td>
         <a href="http://svn.apache.org/repos/asf/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml">changelog.xml</a>
       </td>
-      <td><i>none</i></td>
     
 </tr>
     
@@ -822,9 +783,6 @@ bug in your web application.</p>
 <b>Tomcat 7</b> &ndash; Tomcat 7.0.x</li>
      
 <li>
-<b>Tomcat 6</b> &ndash; Tomcat 6.0.x</li>
-     
-<li>
 <b>Tomcat Connectors</b> &ndash; Integration of Tomcat with other Web servers.
        The <b>mod_jk</b> module for <a href="http://httpd.apache.org/">Apache HTTPD</a>
        and other web servers.</li>

Modified: tomcat/site/trunk/docs/ci.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/ci.html (original)
+++ tomcat/site/trunk/docs/ci.html Fri Jul 28 16:23:11 2017
@@ -67,9 +67,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -99,9 +96,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/conference.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/conference.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/conference.html (original)
+++ tomcat/site/trunk/docs/conference.html Fri Jul 28 16:23:11 2017
@@ -67,9 +67,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -99,9 +96,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/contact.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/contact.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/contact.html (original)
+++ tomcat/site/trunk/docs/contact.html Fri Jul 28 16:23:11 2017
@@ -67,9 +67,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -99,9 +96,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/download-60.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-60.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-60.html (original)
+++ tomcat/site/trunk/docs/download-60.html Fri Jul 28 16:23:11 2017
@@ -67,9 +67,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -99,9 +96,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/download-70.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-70.html (original)
+++ tomcat/site/trunk/docs/download-70.html Fri Jul 28 16:23:11 2017
@@ -67,9 +67,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -99,9 +96,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/download-80.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-80.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-80.html (original)
+++ tomcat/site/trunk/docs/download-80.html Fri Jul 28 16:23:11 2017
@@ -67,9 +67,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -99,9 +96,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/download-90.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-90.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-90.html (original)
+++ tomcat/site/trunk/docs/download-90.html Fri Jul 28 16:23:11 2017
@@ -67,9 +67,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -99,9 +96,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/download-connectors.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-connectors.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-connectors.html (original)
+++ tomcat/site/trunk/docs/download-connectors.html Fri Jul 28 16:23:11 2017
@@ -67,9 +67,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -99,9 +96,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/download-native.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-native.html (original)
+++ tomcat/site/trunk/docs/download-native.html Fri Jul 28 16:23:11 2017
@@ -67,9 +67,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -99,9 +96,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/download-taglibs.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-taglibs.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-taglibs.html (original)
+++ tomcat/site/trunk/docs/download-taglibs.html Fri Jul 28 16:23:11 2017
@@ -67,9 +67,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -99,9 +96,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/findhelp.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/findhelp.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/findhelp.html (original)
+++ tomcat/site/trunk/docs/findhelp.html Fri Jul 28 16:23:11 2017
@@ -67,9 +67,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -99,9 +96,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/getinvolved.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/getinvolved.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/getinvolved.html (original)
+++ tomcat/site/trunk/docs/getinvolved.html Fri Jul 28 16:23:11 2017
@@ -67,9 +67,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -99,9 +96,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/heritage.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/heritage.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/heritage.html (original)
+++ tomcat/site/trunk/docs/heritage.html Fri Jul 28 16:23:11 2017
@@ -67,9 +67,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -99,9 +96,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/index.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Fri Jul 28 16:23:11 2017
@@ -69,9 +69,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -101,9 +98,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/irc.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/irc.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/irc.html (original)
+++ tomcat/site/trunk/docs/irc.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/legal.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/legal.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/legal.html (original)
+++ tomcat/site/trunk/docs/legal.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/lists.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/lists.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/lists.html (original)
+++ tomcat/site/trunk/docs/lists.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/maven-plugin.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/maven-plugin.html (original)
+++ tomcat/site/trunk/docs/maven-plugin.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/migration-6.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-6.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-6.html (original)
+++ tomcat/site/trunk/docs/migration-6.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/migration-7.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-7.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-7.html (original)
+++ tomcat/site/trunk/docs/migration-7.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/migration-8.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-8.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-8.html (original)
+++ tomcat/site/trunk/docs/migration-8.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/migration-85.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-85.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-85.html (original)
+++ tomcat/site/trunk/docs/migration-85.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/migration-9.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-9.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-9.html (original)
+++ tomcat/site/trunk/docs/migration-9.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/migration.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration.html (original)
+++ tomcat/site/trunk/docs/migration.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>
@@ -216,8 +210,8 @@
 sure that the JVM that is installed on your system supports at least the
 required Java version. While it is possible that older versions of Tomcat may
 not be compatible with newer JVMs, all the currently supported Apache Tomcat
-versions (6.0.x, 7.0.x, 8.0.x, 8.5.x and 9.0.x) are known to run correctly
-on Java 8 JVMs.</p>
+versions (7.0.x, 8.0.x, 8.5.x and 9.0.x) are known to run correctly on Java 8
+JVMs.</p>
 
 
 <p>When migrating from one major Tomcat version to another (e.g. from Tomcat 7

Modified: tomcat/site/trunk/docs/oldnews-2010.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2010.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2010.html (original)
+++ tomcat/site/trunk/docs/oldnews-2010.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/oldnews-2011.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2011.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2011.html (original)
+++ tomcat/site/trunk/docs/oldnews-2011.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/oldnews-2012.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2012.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2012.html (original)
+++ tomcat/site/trunk/docs/oldnews-2012.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/oldnews-2013.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2013.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2013.html (original)
+++ tomcat/site/trunk/docs/oldnews-2013.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/oldnews-2014.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2014.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2014.html (original)
+++ tomcat/site/trunk/docs/oldnews-2014.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/oldnews-2015.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2015.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2015.html (original)
+++ tomcat/site/trunk/docs/oldnews-2015.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/oldnews-2016.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2016.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2016.html (original)
+++ tomcat/site/trunk/docs/oldnews-2016.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/oldnews.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews.html (original)
+++ tomcat/site/trunk/docs/oldnews.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/presentations.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/presentations.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/presentations.html (original)
+++ tomcat/site/trunk/docs/presentations.html Fri Jul 28 16:23:11 2017
@@ -67,9 +67,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -99,9 +96,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/resources.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/resources.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/resources.html (original)
+++ tomcat/site/trunk/docs/resources.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/security-3.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-3.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-3.html (original)
+++ tomcat/site/trunk/docs/security-3.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/security-4.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-4.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-4.html (original)
+++ tomcat/site/trunk/docs/security-4.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/security-5.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-5.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-5.html (original)
+++ tomcat/site/trunk/docs/security-5.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/security-6.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-6.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-6.html (original)
+++ tomcat/site/trunk/docs/security-6.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/security-7.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-7.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-7.html (original)
+++ tomcat/site/trunk/docs/security-7.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/security-8.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-8.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-8.html (original)
+++ tomcat/site/trunk/docs/security-8.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/security-9.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-9.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-9.html (original)
+++ tomcat/site/trunk/docs/security-9.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/security-impact.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-impact.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-impact.html (original)
+++ tomcat/site/trunk/docs/security-impact.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/security-jk.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-jk.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-jk.html (original)
+++ tomcat/site/trunk/docs/security-jk.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/security-native.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-native.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-native.html (original)
+++ tomcat/site/trunk/docs/security-native.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/security-taglibs.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-taglibs.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-taglibs.html (original)
+++ tomcat/site/trunk/docs/security-taglibs.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/security.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security.html (original)
+++ tomcat/site/trunk/docs/security.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/svn.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/svn.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/svn.html (original)
+++ tomcat/site/trunk/docs/svn.html Fri Jul 28 16:23:11 2017
@@ -67,9 +67,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -99,9 +96,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/taglibs.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/taglibs.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/taglibs.html (original)
+++ tomcat/site/trunk/docs/taglibs.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/tomcat-55-eol.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-55-eol.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tomcat-55-eol.html (original)
+++ tomcat/site/trunk/docs/tomcat-55-eol.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/tomcat-60-eol.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-60-eol.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tomcat-60-eol.html (original)
+++ tomcat/site/trunk/docs/tomcat-60-eol.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/tomcat-80-eol.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-80-eol.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tomcat-80-eol.html (original)
+++ tomcat/site/trunk/docs/tomcat-80-eol.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>
@@ -219,11 +213,11 @@ will end on 30 June 2018.</p>
 <p>This means that after 30 June 2018:</p>
 
 <ul>
-
+  
 <li>releases from the 8.0.x branch are highly unlikely</li>
-
+  
 <li>bugs affecting only the 8.0.x branch will not be addressed</li>
-
+  
 <li>security vulnerability reports will not be checked against the 8.0.x
     branch</li>
 
@@ -235,12 +229,13 @@ will end on 30 June 2018.</p>
 <ul>
   
 <li>the 8.0.x download links will be removed</li>
-
+  
 <li>the latest 8.0.x release will be removed from the mirror system</li>
-
+  
 <li>the 8.0.x branch in svn will move from <code>/tomcat/tc8.0.x</code> to
-    <code>/tomcat/archive/tc8.0.x</code></li>
-
+    <code>/tomcat/archive/tc8.0.x</code>
+</li>
+  
 <li>the links to the 8.0.x documentation will be removed from
     tomcat.apache.org</li>
 

Modified: tomcat/site/trunk/docs/tools.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tools.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tools.html (original)
+++ tomcat/site/trunk/docs/tools.html Fri Jul 28 16:23:11 2017
@@ -68,9 +68,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -100,9 +97,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/docs/whichversion.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/whichversion.html (original)
+++ tomcat/site/trunk/docs/whichversion.html Fri Jul 28 16:23:11 2017
@@ -70,9 +70,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -102,9 +99,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>
@@ -384,7 +378,7 @@ the associated release notes.</p>
 
 
 <p>Please note that although we offer downloads and documentation of older
-releases, such as Apache Tomcat 6.x, we strongly encourage users to use the
+releases, such as Apache Tomcat 7.x, 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

Modified: tomcat/site/trunk/docs/whoweare.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whoweare.html?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/docs/whoweare.html (original)
+++ tomcat/site/trunk/docs/whoweare.html Fri Jul 28 16:23:11 2017
@@ -67,9 +67,6 @@
 <a href="./download-70.cgi">Tomcat 7</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6</a>
-</li>
-<li>
 <a href="./download-connectors.cgi">Tomcat Connectors</a>
 </li>
 <li>
@@ -99,9 +96,6 @@
 <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
 </li>
 <li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
 <a href="./connectors-doc/">Tomcat Connectors</a>
 </li>
 <li>

Modified: tomcat/site/trunk/xdocs/bugreport.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/bugreport.xml?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/bugreport.xml (original)
+++ tomcat/site/trunk/xdocs/bugreport.xml Fri Jul 28 16:23:11 2017
@@ -137,13 +137,13 @@ problem you are having before reporting
         The same problem should be reported only once, but the fix may
         be applied to different Tomcat versions. While doing so, the bug report
         is moved between different products. A bug that is originally
-        reported against Tomcat 8 is moved to Tomcat 7 and maybe later to
-        Tomcat 6. So it makes sense to search all the versions at once.</p>
+        reported against Tomcat 9 is moved to Tomcat 8 and maybe later to
+        Tomcat 7. So it makes sense to search all the versions at once.</p>
 
         <p>Here is a quick list of supported products:</p>
         <ul>
-         <li><b>Tomcat 9</b>, <b>Tomcat 8</b>, <b>Tomcat 7</b> and
-         <b>Tomcat 6</b> &#x2013; Tomcat 9.0.x, 8.5.x or 8.0.x, 7.0.x and 6.0.x</li>
+         <li><b>Tomcat 9</b>, <b>Tomcat 8</b> and <b>Tomcat 7</b>
+             &#x2013; Tomcat 9.0.x, 8.5.x or 8.0.x and 7.0.x</li>
          <li><b>Tomcat Connectors</b> &#x2013; Integration of Tomcat with other Web servers</li>
          <li><b>Tomcat Native</b> &#x2013; APR based native HTTP and AJP connectors for Tomcat</li>
          <li><b>Tomcat Modules</b> &#x2013; Additional Tomcat components</li>
@@ -186,12 +186,6 @@ problem you are having before reporting
         <p>The files are also available in nightly documentation builds.
           See <a href="ci.html">Buildbot</a> page for details.</p>
       </li>
-      <li><p>STATUS file for Tomcat 6</p>
-        <p>A STATUS file is used in Review-Then-Commit development process to
-          propose and then vote for the proposed patches. These are available
-          in the source code of versions of Tomcat that use Review-Than-Commit.
-          Currently only Tomcat 6 uses this development model.</p>
-      </li>
     </ul>
 
     <p>Links:</p>
@@ -201,7 +195,6 @@ problem you are having before reporting
       <th><strong>Product</strong></th>
       <th><strong>Changelog (released)</strong></th>
       <th><strong>Changelog (unreleased)</strong></th>
-      <th><strong>STATUS</strong></th>
     </tr>
 
     <tr>
@@ -212,7 +205,6 @@ problem you are having before reporting
       <td>
         <a href="http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml">changelog.xml</a>
       </td>
-      <td><i>none</i></td>
     </tr>
 
     <tr>
@@ -223,7 +215,6 @@ problem you are having before reporting
       <td>
         <a href="http://svn.apache.org/repos/asf/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml">changelog.xml</a>
       </td>
-      <td><i>none</i></td>
     </tr>
 
     <tr>
@@ -234,7 +225,6 @@ problem you are having before reporting
       <td>
         <a href="http://svn.apache.org/repos/asf/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml">changelog.xml</a>
       </td>
-      <td><i>none</i></td>
     </tr>
 
     <tr>
@@ -245,20 +235,6 @@ problem you are having before reporting
       <td>
         <a href="http://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml">changelog.xml</a>
       </td>
-      <td><i>none</i></td>
-    </tr>
-
-    <tr>
-      <td>Tomcat 6.0</td>
-      <td>
-        <a href="http://tomcat.apache.org/tomcat-6.0-doc/changelog.html">changelog.html</a>
-      </td>
-      <td>
-        <a href="http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml">changelog.xml</a>
-      </td>
-      <td>
-        <a href="http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?view=markup">STATUS.txt</a>
-      </td>
     </tr>
 
     <tr>
@@ -269,7 +245,6 @@ problem you are having before reporting
       <td>
         <a href="http://svn.apache.org/repos/asf/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml">changelog.xml</a>
       </td>
-      <td><i>none</i></td>
     </tr>
 
     <tr>
@@ -280,7 +255,6 @@ problem you are having before reporting
       <td>
         <a href="http://svn.apache.org/repos/asf/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml">changelog.xml</a>
       </td>
-      <td><i>none</i></td>
     </tr>
     </table>
   </subsection>
@@ -371,7 +345,6 @@ bug in your web application.</p>
      <li><b>Tomcat 9</b> &#x2013; Tomcat 9.0.x and tomcat.apache.org web site</li>
      <li><b>Tomcat 8</b> &#x2013; Tomcat 8.5.x and 8.0.x</li>
      <li><b>Tomcat 7</b> &#x2013; Tomcat 7.0.x</li>
-     <li><b>Tomcat 6</b> &#x2013; Tomcat 6.0.x</li>
      <li><b>Tomcat Connectors</b> &#x2013; Integration of Tomcat with other Web servers.
        The <b>mod_jk</b> module for <a href="http://httpd.apache.org/">Apache HTTPD</a>
        and other web servers.</li>

Modified: tomcat/site/trunk/xdocs/migration.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration.xml?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/migration.xml (original)
+++ tomcat/site/trunk/xdocs/migration.xml Fri Jul 28 16:23:11 2017
@@ -14,8 +14,8 @@
 sure that the JVM that is installed on your system supports at least the
 required Java version. While it is possible that older versions of Tomcat may
 not be compatible with newer JVMs, all the currently supported Apache Tomcat
-versions (6.0.x, 7.0.x, 8.0.x, 8.5.x and 9.0.x) are known to run correctly
-on Java 8 JVMs.</p>
+versions (7.0.x, 8.0.x, 8.5.x and 9.0.x) are known to run correctly on Java 8
+JVMs.</p>
 
 <p>When migrating from one major Tomcat version to another (e.g. from Tomcat 7
 to Tomcat 8, or from Tomcat 8 to Tomcat 8.5),

Modified: tomcat/site/trunk/xdocs/stylesheets/project.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/project.xml?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/stylesheets/project.xml (original)
+++ tomcat/site/trunk/xdocs/stylesheets/project.xml Fri Jul 28 16:23:11 2017
@@ -16,7 +16,6 @@
         <item name="Tomcat 9"                 href="/download-90.cgi"/>
         <item name="Tomcat 8"                 href="/download-80.cgi"/>
         <item name="Tomcat 7"                 href="/download-70.cgi"/>
-        <item name="Tomcat 6"                 href="/download-60.cgi"/>
         <item name="Tomcat Connectors"        href="/download-connectors.cgi"/>
         <item name="Tomcat Native"            href="/download-native.cgi"/>
         <item name="Taglibs"                  href="/download-taglibs.cgi"/>
@@ -28,7 +27,6 @@
         <item name="Tomcat 8.5"               href="/tomcat-8.5-doc/index.html"/>
         <item name="Tomcat 8.0"               href="/tomcat-8.0-doc/index.html"/>
         <item name="Tomcat 7.0"               href="/tomcat-7.0-doc/index.html"/>
-        <item name="Tomcat 6.0"               href="/tomcat-6.0-doc/index.html"/>
         <item name="Tomcat Connectors"        href="/connectors-doc/"/>
         <item name="Tomcat Native"            href="/native-doc/"/>
         <item name="Wiki"                     href="http://wiki.apache.org/tomcat/FrontPage"/>

Modified: tomcat/site/trunk/xdocs/whichversion.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whichversion.xml?rev=1803294&r1=1803293&r2=1803294&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/whichversion.xml (original)
+++ tomcat/site/trunk/xdocs/whichversion.xml Fri Jul 28 16:23:11 2017
@@ -144,7 +144,7 @@ which one is right for you.  More detail
 the associated release notes.</p>
 
 <p>Please note that although we offer downloads and documentation of older
-releases, such as Apache Tomcat 6.x, we strongly encourage users to use the
+releases, such as Apache Tomcat 7.x, 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



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