Modified: tomcat/site/trunk/docs/taglibs.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/taglibs.html?rev=1824755&r1=1824754&r2=1824755&view=diff
==============================================================================
--- tomcat/site/trunk/docs/taglibs.html (original)
+++ tomcat/site/trunk/docs/taglibs.html Mon Feb 19 14:49:58 2018
@@ -1,289 +1,304 @@
 <!DOCTYPE html SYSTEM "about:legacy-compat">
 <html lang="en">
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<link href="res/css/tomcat.css" rel="stylesheet" type="text/css">
-<link href="res/css/fonts/fonts.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat&reg; - Apache Taglibs</title>
-<meta name="author" content="Apache Tomcat Project">
-</head>
-<body>
-<div id="wrapper">
-<header id="header">
-<div class="clearfix">
-<div class="menu-toggler pull-left" tabindex="1">
-<div class="hamburger"></div>
-</div>
-<a href="http://tomcat.apache.org/";><img class="tomcat-logo pull-left noPrint" 
alt="Tomcat Home" src="res/images/tomcat.png"></a>
-<h1 class="pull-left">Apache Tomcat<sup>&reg;</sup>
-</h1>
-<div class="asf-logos pull-right">
-<a href="https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left"><img 
src="https://www.apache.org/images/SupportApache-small.png"; class="support-asf" 
alt="Support Apache"></a><a href="http://www.apache.org/"; target="_blank" 
class="pull-left"><img src="res/images/asf_logo.svg" class="asf-logo" alt="The 
Apache Software Foundation"></a>
-</div>
-</div>
-</header>
-<main id="middle">
-<div>
-<div id="mainLeft">
-<div id="nav-wrapper">
-<form action="https://www.google.com/search"; method="get">
-<div class="searchbox">
-<input value="tomcat.apache.org" name="sitesearch" type="hidden"><input 
placeholder="Search&hellip;" required="required" name="q" id="query" 
type="search"><button>GO</button>
-</div>
-</form>
-<nav>
-<div>
-<h2>Apache Tomcat</h2>
-<ul>
-<li>
-<a href="./index.html">Home</a>
-</li>
-<li>
-<a href="./taglibs.html">Taglibs</a>
-</li>
-<li>
-<a href="./maven-plugin.html">Maven Plugin</a>
-</li>
-</ul>
-</div>
-<div>
-<h2>Download</h2>
-<ul>
-<li>
-<a href="./whichversion.html">Which version?</a>
-</li>
-<li>
-<a href="https://tomcat.apache.org/download-90.cgi";>Tomcat 9</a>
-</li>
-<li>
-<a href="https://tomcat.apache.org/download-80.cgi";>Tomcat 8</a>
-</li>
-<li>
-<a href="https://tomcat.apache.org/download-70.cgi";>Tomcat 7</a>
-</li>
-<li>
-<a href="https://tomcat.apache.org/download-connectors.cgi";>Tomcat 
Connectors</a>
-</li>
-<li>
-<a href="https://tomcat.apache.org/download-native.cgi";>Tomcat Native</a>
-</li>
-<li>
-<a href="https://tomcat.apache.org/download-taglibs.cgi";>Taglibs</a>
-</li>
-<li>
-<a href="https://archive.apache.org/dist/tomcat/";>Archives</a>
-</li>
-</ul>
-</div>
-<div>
-<h2>Documentation</h2>
-<ul>
-<li>
-<a href="./tomcat-9.0-doc/index.html">Tomcat 9.0</a>
-</li>
-<li>
-<a href="./tomcat-8.5-doc/index.html">Tomcat 8.5</a>
-</li>
-<li>
-<a href="./tomcat-8.0-doc/index.html">Tomcat 8.0</a>
-</li>
-<li>
-<a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
-</li>
-<li>
-<a href="./connectors-doc/">Tomcat Connectors</a>
-</li>
-<li>
-<a href="./native-doc/">Tomcat Native</a>
-</li>
-<li>
-<a href="https://wiki.apache.org/tomcat/FrontPage";>Wiki</a>
-</li>
-<li>
-<a href="./migration.html">Migration Guide</a>
-</li>
-<li>
-<a href="./presentations.html">Presentations</a>
-</li>
-</ul>
-</div>
-<div>
-<h2>Problems?</h2>
-<ul>
-<li>
-<a href="./security.html">Security Reports</a>
-</li>
-<li>
-<a href="./findhelp.html">Find help</a>
-</li>
-<li>
-<a href="https://wiki.apache.org/tomcat/FAQ";>FAQ</a>
-</li>
-<li>
-<a href="./lists.html">Mailing Lists</a>
-</li>
-<li>
-<a href="./bugreport.html">Bug Database</a>
-</li>
-<li>
-<a href="./irc.html">IRC</a>
-</li>
-</ul>
-</div>
-<div>
-<h2>Get Involved</h2>
-<ul>
-<li>
-<a href="./getinvolved.html">Overview</a>
-</li>
-<li>
-<a href="./svn.html">Source code</a>
-</li>
-<li>
-<a href="./ci.html">Buildbot</a>
-</li>
-<li>
-<a href="./tools.html">Tools</a>
-</li>
-</ul>
-</div>
-<div>
-<h2>Media</h2>
-<ul>
-<li>
-<a href="https://twitter.com/theapachetomcat";>Twitter</a>
-</li>
-<li>
-<a href="https://www.youtube.com/c/ApacheTomcatOfficial";>YouTube</a>
-</li>
-<li>
-<a href="https://blogs.apache.org/tomcat/";>Blog</a>
-</li>
-</ul>
-</div>
-<div>
-<h2>Misc</h2>
-<ul>
-<li>
-<a href="./whoweare.html">Who We Are</a>
-</li>
-<li>
-<a href="./heritage.html">Heritage</a>
-</li>
-<li>
-<a href="http://www.apache.org";>Apache Home</a>
-</li>
-<li>
-<a href="./resources.html">Resources</a>
-</li>
-<li>
-<a href="./contact.html">Contact</a>
-</li>
-<li>
-<a href="./legal.html">Legal</a>
-</li>
-<li>
-<a href="https://www.apache.org/foundation/contributing.html";>Support 
Apache</a>
-</li>
-<li>
-<a href="https://www.apache.org/foundation/sponsorship.html";>Sponsorship</a>
-</li>
-<li>
-<a href="http://www.apache.org/foundation/thanks.html";>Thanks</a>
-</li>
-</ul>
-</div>
-</nav>
-</div>
-</div>
-<div id="mainRight">
-<div id="content">
-<h2 style="display: none;">Content</h2>
-<h3 id="Apache_Taglibs">Apache Taglibs</h3>
-<div class="text">
-      
-<p>Apache Taglibs provides open source implementations of Tag Libraries for 
use with
+    <head>
+        <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link href="res/css/tomcat.css" rel="stylesheet" type="text/css">
+        <link href="res/css/fonts/fonts.css" rel="stylesheet" type="text/css">
+        <title>Apache Tomcat&reg; - Apache Taglibs</title>
+        <meta name="author" content="Apache Tomcat Project">
+    </head>
+    <body>
+        <div id="wrapper">
+            <header id="header">
+                <div class="clearfix">
+                    <div class="menu-toggler pull-left" tabindex="1">
+                        <div class="hamburger"></div>
+                    </div>
+                    <a href="http://tomcat.apache.org/";><img 
class="tomcat-logo pull-left noPrint" alt="Tomcat Home" 
src="res/images/tomcat.png"></a>
+                    <h1 class="pull-left">
+                        Apache Tomcat<sup>&reg;</sup>
+                    </h1>
+                    <div class="asf-logos pull-right">
+                        <a 
href="https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left"><img 
src="https://www.apache.org/images/SupportApache-small.png"; class="support-asf" 
alt="Support Apache"></a><a href="http://www.apache.org/"; target="_blank" 
class="pull-left"><img src="res/images/asf_logo.svg" class="asf-logo" alt="The 
Apache Software Foundation"></a>
+                    </div>
+                </div>
+            </header>
+            <main id="middle">
+                <div>
+                    <div id="mainLeft">
+                        <div id="nav-wrapper">
+                            <form action="https://www.google.com/search"; 
method="get">
+                                <div class="searchbox">
+                                    <input value="tomcat.apache.org" 
name="sitesearch" type="hidden"><input placeholder="Search&hellip;" 
required="required" name="q" id="query" type="search"><button>GO</button>
+                                </div>
+                            </form>
+                            <nav>
+                                <div>
+                                    <h2>Apache Tomcat</h2>
+                                    <ul>
+                                        <li>
+                                            <a href="./index.html">Home</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="./taglibs.html">Taglibs</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="./maven-plugin.html">Maven Plugin</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <div>
+                                    <h2>TomcatCon</h2>
+                                    <ul>
+                                        <li>
+                                            <a 
href="./conference.html">Training, Manchester</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <div>
+                                    <h2>Download</h2>
+                                    <ul>
+                                        <li>
+                                            <a 
href="./whichversion.html">Which version?</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://tomcat.apache.org/download-90.cgi";>Tomcat 9</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://tomcat.apache.org/download-80.cgi";>Tomcat 8</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://tomcat.apache.org/download-70.cgi";>Tomcat 7</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://tomcat.apache.org/download-connectors.cgi";>Tomcat Connectors</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://tomcat.apache.org/download-native.cgi";>Tomcat Native</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://tomcat.apache.org/download-taglibs.cgi";>Taglibs</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://archive.apache.org/dist/tomcat/";>Archives</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <div>
+                                    <h2>Documentation</h2>
+                                    <ul>
+                                        <li>
+                                            <a 
href="./tomcat-9.0-doc/index.html">Tomcat 9.0</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="./tomcat-8.5-doc/index.html">Tomcat 8.5</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="./tomcat-8.0-doc/index.html">Tomcat 8.0</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
+                                        </li>
+                                        <li>
+                                            <a href="./connectors-doc/">Tomcat 
Connectors</a>
+                                        </li>
+                                        <li>
+                                            <a href="./native-doc/">Tomcat 
Native</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://wiki.apache.org/tomcat/FrontPage";>Wiki</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="./migration.html">Migration Guide</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="./presentations.html">Presentations</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <div>
+                                    <h2>Problems?</h2>
+                                    <ul>
+                                        <li>
+                                            <a href="./security.html">Security 
Reports</a>
+                                        </li>
+                                        <li>
+                                            <a href="./findhelp.html">Find 
help</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://wiki.apache.org/tomcat/FAQ";>FAQ</a>
+                                        </li>
+                                        <li>
+                                            <a href="./lists.html">Mailing 
Lists</a>
+                                        </li>
+                                        <li>
+                                            <a href="./bugreport.html">Bug 
Database</a>
+                                        </li>
+                                        <li>
+                                            <a href="./irc.html">IRC</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <div>
+                                    <h2>Get Involved</h2>
+                                    <ul>
+                                        <li>
+                                            <a 
href="./getinvolved.html">Overview</a>
+                                        </li>
+                                        <li>
+                                            <a href="./svn.html">Source 
code</a>
+                                        </li>
+                                        <li>
+                                            <a href="./ci.html">Buildbot</a>
+                                        </li>
+                                        <li>
+                                            <a href="./tools.html">Tools</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <div>
+                                    <h2>Media</h2>
+                                    <ul>
+                                        <li>
+                                            <a 
href="https://twitter.com/theapachetomcat";>Twitter</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://www.youtube.com/c/ApacheTomcatOfficial";>YouTube</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://blogs.apache.org/tomcat/";>Blog</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <div>
+                                    <h2>Misc</h2>
+                                    <ul>
+                                        <li>
+                                            <a href="./whoweare.html">Who We 
Are</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="./heritage.html">Heritage</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="http://www.apache.org";>Apache Home</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="./resources.html">Resources</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="./contact.html">Contact</a>
+                                        </li>
+                                        <li>
+                                            <a href="./legal.html">Legal</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://www.apache.org/foundation/contributing.html";>Support Apache</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://www.apache.org/foundation/sponsorship.html";>Sponsorship</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                            </nav>
+                        </div>
+                    </div>
+                    <div id="mainRight">
+                        <div id="content">
+                            <h2 style="display: none;">Content</h2>
+                            <h3 id="Apache_Taglibs">Apache Taglibs</h3>
+                            <div class="text">
+                                      
+                                <p>
+                                    Apache Taglibs provides open source 
implementations of Tag Libraries for use with
         Java Server Pages (JSPs). In particular, it hosts the Apache Standard 
Taglib, an
         open source implementation of the
         <a href="https://jcp.org/en/jsr/detail?id=52";>Java Standard Tag 
Library (JSTL)</a>
         specification.
-      </p>
-    
-</div>
-<h3 id="Apache_Standard_Taglib">Apache Standard Taglib</h3>
-<div class="text">
       
-<p>The Apache Standard Taglib implements JSTL 1.2 and supports request-time 
expressions
+                                </p>
+                                    
+                            </div>
+                            <h3 id="Apache_Standard_Taglib">Apache Standard 
Taglib</h3>
+                            <div class="text">
+                                      
+                                <p>The Apache Standard Taglib implements JSTL 
1.2 and supports request-time expressions
         that are evaluated by the JSP container.
       </p>
-
-      
-<p>In addition, compatibility for applications using 1.0 expression language 
tags can
+                                      
+                                <p>In addition, compatibility for applications 
using 1.0 expression language tags can
         be enabled in one of two ways:
       </p>
-        
-<ul>
-          
-<li>Using the <b>-jstlel</b> jar supports JSTL 1.0 EL expressions by using the 
EL
+                                        
+                                <ul>
+                                              
+                                    <li>
+                                        Using the <b>-jstlel</b> jar supports 
JSTL 1.0 EL expressions by using the EL
             implementation originally defined by JSTL itself.
-          </li>
           
-<li>Using the <b>-compat</b> jar supports JSTL 1.0 EL expressions by using the
+                                    </li>
+                                              
+                                    <li>
+                                        Using the <b>-compat</b> jar supports 
JSTL 1.0 EL expressions by using the
             container's implementation of EL to take advantage of newer 
functionality and
             potential performance improvements in more modern versions.
-          </li>
-        
-</ul>
-
-      
-<p style="text-align: center;">
-        
-<a href="https://tomcat.apache.org/download-taglibs.cgi";>Download</a> |
+          
+                                    </li>
+                                            
+                                </ul>
+                                      
+                                <p style="text-align: center;">
+                                            <a 
href="https://tomcat.apache.org/download-taglibs.cgi";>Download</a> |
         <a href="taglibs/CHANGES.txt">Changes</a>
       
-</p>
-
-      
-<p>Please see the <a 
href="https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/README_bin.txt";>README</a>
-      file for more detailed information on using the library.</p>
-
-      
-<p>For performance reasons the XML tags use Apache Xalan directly for 
evaluating XPath
+                                </p>
+                                      
+                                <p>
+                                    Please see the <a 
href="https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/README_bin.txt";>README</a>
+      file for more detailed information on using the library.
+                                </p>
+                                      
+                                <p>For performance reasons the XML tags use 
Apache Xalan directly for evaluating XPath
         expressions. The Xalan 2.7.1 implementation jars xalan.jar and 
serializer.jar must be
         added to the classpath.
       </p>
-
-      
-<p>The Standard Taglib jars may be packaged with a web-application in its 
/WEB-INF/lib
+                                      
+                                <p>The Standard Taglib jars may be packaged 
with a web-application in its /WEB-INF/lib
         directory, or may be made available to all applications in a container 
by adding them
         to the container's classpath.
       </p>
-    
-</div>
-<h3 id="Jakarta_Taglibs">Jakarta Taglibs</h3>
-<div class="text">
-      
-<p>Apache Taglibs were originally developed as part of the Apache Jakarta 
project.
+                                    
+                            </div>
+                            <h3 id="Jakarta_Taglibs">Jakarta Taglibs</h3>
+                            <div class="text">
+                                      
+                                <p>
+                                    Apache Taglibs were originally developed 
as part of the Apache Jakarta project.
         That project has
         <a 
href="http://attic.apache.org/projects/jakarta-taglibs.html";>officially been 
retired</a>
         and the original tag libraries moved to the
         <a href="http://attic.apache.org/";>Apache Attic</a>.
-      </p>
+      
+                                </p>
+                                    
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </main>
+            <footer id="footer">
+                    Copyright &copy; 1999-2018, The Apache Software Foundation
     
-</div>
-</div>
-</div>
-</div>
-</main>
-<footer id="footer">
-    Copyright &copy; 1999-2018, The Apache Software Foundation
-    <br>
-    Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
+                <br>
+                    Apache Tomcat, Tomcat, Apache, the Apache feather, and the 
Apache Tomcat
     project logo are either registered trademarks or trademarks of the Apache
     Software Foundation.
-  </footer>
-</div>
-<script src="res/js/tomcat.js"></script>
-</body>
+  
+            </footer>
+        </div>
+        <script src="res/js/tomcat.js"></script>
+    </body>
 </html>

Modified: tomcat/site/trunk/docs/tomcat-55-eol.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-55-eol.html?rev=1824755&r1=1824754&r2=1824755&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tomcat-55-eol.html (original)
+++ tomcat/site/trunk/docs/tomcat-55-eol.html Mon Feb 19 14:49:58 2018
@@ -1,267 +1,275 @@
 <!DOCTYPE html SYSTEM "about:legacy-compat">
 <html lang="en">
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<link href="res/css/tomcat.css" rel="stylesheet" type="text/css">
-<link href="res/css/fonts/fonts.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat&reg; - End of life for Apache Tomcat 5.5.x</title>
-<meta name="author" content="Apache Tomcat Project">
-</head>
-<body>
-<div id="wrapper">
-<header id="header">
-<div class="clearfix">
-<div class="menu-toggler pull-left" tabindex="1">
-<div class="hamburger"></div>
-</div>
-<a href="http://tomcat.apache.org/";><img class="tomcat-logo pull-left noPrint" 
alt="Tomcat Home" src="res/images/tomcat.png"></a>
-<h1 class="pull-left">Apache Tomcat<sup>&reg;</sup>
-</h1>
-<div class="asf-logos pull-right">
-<a href="https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left"><img 
src="https://www.apache.org/images/SupportApache-small.png"; class="support-asf" 
alt="Support Apache"></a><a href="http://www.apache.org/"; target="_blank" 
class="pull-left"><img src="res/images/asf_logo.svg" class="asf-logo" alt="The 
Apache Software Foundation"></a>
-</div>
-</div>
-</header>
-<main id="middle">
-<div>
-<div id="mainLeft">
-<div id="nav-wrapper">
-<form action="https://www.google.com/search"; method="get">
-<div class="searchbox">
-<input value="tomcat.apache.org" name="sitesearch" type="hidden"><input 
placeholder="Search&hellip;" required="required" name="q" id="query" 
type="search"><button>GO</button>
-</div>
-</form>
-<nav>
-<div>
-<h2>Apache Tomcat</h2>
-<ul>
-<li>
-<a href="./index.html">Home</a>
-</li>
-<li>
-<a href="./taglibs.html">Taglibs</a>
-</li>
-<li>
-<a href="./maven-plugin.html">Maven Plugin</a>
-</li>
-</ul>
-</div>
-<div>
-<h2>Download</h2>
-<ul>
-<li>
-<a href="./whichversion.html">Which version?</a>
-</li>
-<li>
-<a href="https://tomcat.apache.org/download-90.cgi";>Tomcat 9</a>
-</li>
-<li>
-<a href="https://tomcat.apache.org/download-80.cgi";>Tomcat 8</a>
-</li>
-<li>
-<a href="https://tomcat.apache.org/download-70.cgi";>Tomcat 7</a>
-</li>
-<li>
-<a href="https://tomcat.apache.org/download-connectors.cgi";>Tomcat 
Connectors</a>
-</li>
-<li>
-<a href="https://tomcat.apache.org/download-native.cgi";>Tomcat Native</a>
-</li>
-<li>
-<a href="https://tomcat.apache.org/download-taglibs.cgi";>Taglibs</a>
-</li>
-<li>
-<a href="https://archive.apache.org/dist/tomcat/";>Archives</a>
-</li>
-</ul>
-</div>
-<div>
-<h2>Documentation</h2>
-<ul>
-<li>
-<a href="./tomcat-9.0-doc/index.html">Tomcat 9.0</a>
-</li>
-<li>
-<a href="./tomcat-8.5-doc/index.html">Tomcat 8.5</a>
-</li>
-<li>
-<a href="./tomcat-8.0-doc/index.html">Tomcat 8.0</a>
-</li>
-<li>
-<a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
-</li>
-<li>
-<a href="./connectors-doc/">Tomcat Connectors</a>
-</li>
-<li>
-<a href="./native-doc/">Tomcat Native</a>
-</li>
-<li>
-<a href="https://wiki.apache.org/tomcat/FrontPage";>Wiki</a>
-</li>
-<li>
-<a href="./migration.html">Migration Guide</a>
-</li>
-<li>
-<a href="./presentations.html">Presentations</a>
-</li>
-</ul>
-</div>
-<div>
-<h2>Problems?</h2>
-<ul>
-<li>
-<a href="./security.html">Security Reports</a>
-</li>
-<li>
-<a href="./findhelp.html">Find help</a>
-</li>
-<li>
-<a href="https://wiki.apache.org/tomcat/FAQ";>FAQ</a>
-</li>
-<li>
-<a href="./lists.html">Mailing Lists</a>
-</li>
-<li>
-<a href="./bugreport.html">Bug Database</a>
-</li>
-<li>
-<a href="./irc.html">IRC</a>
-</li>
-</ul>
-</div>
-<div>
-<h2>Get Involved</h2>
-<ul>
-<li>
-<a href="./getinvolved.html">Overview</a>
-</li>
-<li>
-<a href="./svn.html">Source code</a>
-</li>
-<li>
-<a href="./ci.html">Buildbot</a>
-</li>
-<li>
-<a href="./tools.html">Tools</a>
-</li>
-</ul>
-</div>
-<div>
-<h2>Media</h2>
-<ul>
-<li>
-<a href="https://twitter.com/theapachetomcat";>Twitter</a>
-</li>
-<li>
-<a href="https://www.youtube.com/c/ApacheTomcatOfficial";>YouTube</a>
-</li>
-<li>
-<a href="https://blogs.apache.org/tomcat/";>Blog</a>
-</li>
-</ul>
-</div>
-<div>
-<h2>Misc</h2>
-<ul>
-<li>
-<a href="./whoweare.html">Who We Are</a>
-</li>
-<li>
-<a href="./heritage.html">Heritage</a>
-</li>
-<li>
-<a href="http://www.apache.org";>Apache Home</a>
-</li>
-<li>
-<a href="./resources.html">Resources</a>
-</li>
-<li>
-<a href="./contact.html">Contact</a>
-</li>
-<li>
-<a href="./legal.html">Legal</a>
-</li>
-<li>
-<a href="https://www.apache.org/foundation/contributing.html";>Support 
Apache</a>
-</li>
-<li>
-<a href="https://www.apache.org/foundation/sponsorship.html";>Sponsorship</a>
-</li>
-<li>
-<a href="http://www.apache.org/foundation/thanks.html";>Thanks</a>
-</li>
-</ul>
-</div>
-</nav>
-</div>
-</div>
-<div id="mainRight">
-<div id="content">
-<h2 style="display: none;">Content</h2>
-<h3 id="End_of_life_for_Apache_Tomcat_5.5.x">
-<span class="pull-right">2011-08-10</span> End of life for Apache Tomcat 
5.5.x</h3>
-<div class="text">
-
-<p>The Apache Tomcat team announces that support for Apache Tomcat 5.5.x
+    <head>
+        <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link href="res/css/tomcat.css" rel="stylesheet" type="text/css">
+        <link href="res/css/fonts/fonts.css" rel="stylesheet" type="text/css">
+        <title>Apache Tomcat&reg; - End of life for Apache Tomcat 5.5.x</title>
+        <meta name="author" content="Apache Tomcat Project">
+    </head>
+    <body>
+        <div id="wrapper">
+            <header id="header">
+                <div class="clearfix">
+                    <div class="menu-toggler pull-left" tabindex="1">
+                        <div class="hamburger"></div>
+                    </div>
+                    <a href="http://tomcat.apache.org/";><img 
class="tomcat-logo pull-left noPrint" alt="Tomcat Home" 
src="res/images/tomcat.png"></a>
+                    <h1 class="pull-left">
+                        Apache Tomcat<sup>&reg;</sup>
+                    </h1>
+                    <div class="asf-logos pull-right">
+                        <a 
href="https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left"><img 
src="https://www.apache.org/images/SupportApache-small.png"; class="support-asf" 
alt="Support Apache"></a><a href="http://www.apache.org/"; target="_blank" 
class="pull-left"><img src="res/images/asf_logo.svg" class="asf-logo" alt="The 
Apache Software Foundation"></a>
+                    </div>
+                </div>
+            </header>
+            <main id="middle">
+                <div>
+                    <div id="mainLeft">
+                        <div id="nav-wrapper">
+                            <form action="https://www.google.com/search"; 
method="get">
+                                <div class="searchbox">
+                                    <input value="tomcat.apache.org" 
name="sitesearch" type="hidden"><input placeholder="Search&hellip;" 
required="required" name="q" id="query" type="search"><button>GO</button>
+                                </div>
+                            </form>
+                            <nav>
+                                <div>
+                                    <h2>Apache Tomcat</h2>
+                                    <ul>
+                                        <li>
+                                            <a href="./index.html">Home</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="./taglibs.html">Taglibs</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="./maven-plugin.html">Maven Plugin</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <div>
+                                    <h2>TomcatCon</h2>
+                                    <ul>
+                                        <li>
+                                            <a 
href="./conference.html">Training, Manchester</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <div>
+                                    <h2>Download</h2>
+                                    <ul>
+                                        <li>
+                                            <a 
href="./whichversion.html">Which version?</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://tomcat.apache.org/download-90.cgi";>Tomcat 9</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://tomcat.apache.org/download-80.cgi";>Tomcat 8</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://tomcat.apache.org/download-70.cgi";>Tomcat 7</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://tomcat.apache.org/download-connectors.cgi";>Tomcat Connectors</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://tomcat.apache.org/download-native.cgi";>Tomcat Native</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://tomcat.apache.org/download-taglibs.cgi";>Taglibs</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://archive.apache.org/dist/tomcat/";>Archives</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <div>
+                                    <h2>Documentation</h2>
+                                    <ul>
+                                        <li>
+                                            <a 
href="./tomcat-9.0-doc/index.html">Tomcat 9.0</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="./tomcat-8.5-doc/index.html">Tomcat 8.5</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="./tomcat-8.0-doc/index.html">Tomcat 8.0</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
+                                        </li>
+                                        <li>
+                                            <a href="./connectors-doc/">Tomcat 
Connectors</a>
+                                        </li>
+                                        <li>
+                                            <a href="./native-doc/">Tomcat 
Native</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://wiki.apache.org/tomcat/FrontPage";>Wiki</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="./migration.html">Migration Guide</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="./presentations.html">Presentations</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <div>
+                                    <h2>Problems?</h2>
+                                    <ul>
+                                        <li>
+                                            <a href="./security.html">Security 
Reports</a>
+                                        </li>
+                                        <li>
+                                            <a href="./findhelp.html">Find 
help</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://wiki.apache.org/tomcat/FAQ";>FAQ</a>
+                                        </li>
+                                        <li>
+                                            <a href="./lists.html">Mailing 
Lists</a>
+                                        </li>
+                                        <li>
+                                            <a href="./bugreport.html">Bug 
Database</a>
+                                        </li>
+                                        <li>
+                                            <a href="./irc.html">IRC</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <div>
+                                    <h2>Get Involved</h2>
+                                    <ul>
+                                        <li>
+                                            <a 
href="./getinvolved.html">Overview</a>
+                                        </li>
+                                        <li>
+                                            <a href="./svn.html">Source 
code</a>
+                                        </li>
+                                        <li>
+                                            <a href="./ci.html">Buildbot</a>
+                                        </li>
+                                        <li>
+                                            <a href="./tools.html">Tools</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <div>
+                                    <h2>Media</h2>
+                                    <ul>
+                                        <li>
+                                            <a 
href="https://twitter.com/theapachetomcat";>Twitter</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://www.youtube.com/c/ApacheTomcatOfficial";>YouTube</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://blogs.apache.org/tomcat/";>Blog</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <div>
+                                    <h2>Misc</h2>
+                                    <ul>
+                                        <li>
+                                            <a href="./whoweare.html">Who We 
Are</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="./heritage.html">Heritage</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="http://www.apache.org";>Apache Home</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="./resources.html">Resources</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="./contact.html">Contact</a>
+                                        </li>
+                                        <li>
+                                            <a href="./legal.html">Legal</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://www.apache.org/foundation/contributing.html";>Support Apache</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://www.apache.org/foundation/sponsorship.html";>Sponsorship</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                            </nav>
+                        </div>
+                    </div>
+                    <div id="mainRight">
+                        <div id="content">
+                            <h2 style="display: none;">Content</h2>
+                            <h3 id="End_of_life_for_Apache_Tomcat_5.5.x">
+                                <span class="pull-right">2011-08-10</span> End 
of life for Apache Tomcat 5.5.x
+                            </h3>
+                            <div class="text">
+                                
+                                <p>The Apache Tomcat team announces that 
support for Apache Tomcat 5.5.x
 will end on 30 September 2012.</p>
-
-
-<p>This means that after 30 September 2012:</p>
-
-<ul>
-  
-<li>releases from the 5.5.x branch are highly unlikely</li>
-  
-<li>bugs affecting only the 5.5.x branch will not be addressed</li>
-  
-<li>security vulnerability reports will not be checked against the 5.5.x
+                                
+                                <p>This means that after 30 September 2012:</p>
+                                
+                                <ul>
+                                      
+                                    <li>releases from the 5.5.x branch are 
highly unlikely</li>
+                                      
+                                    <li>bugs affecting only the 5.5.x branch 
will not be addressed</li>
+                                      
+                                    <li>security vulnerability reports will 
not be checked against the 5.5.x
     branch</li>
-
-</ul>
-
-
-<p>Three months later (i.e. after 31 December 2012)</p>
-
-<ul>
-  
-<li>the 5.5.x download pages will be removed</li>
-  
-<li>the latest 5.5.x release will be removed from the mirror system</li>
-  
-<li>the 5.5.x branch in svn will move from <code>/tomcat/tc5.5.x</code> to
+                                    
+                                </ul>
+                                
+                                <p>Three months later (i.e. after 31 December 
2012)</p>
+                                
+                                <ul>
+                                      
+                                    <li>the 5.5.x download pages will be 
removed</li>
+                                      
+                                    <li>the latest 5.5.x release will be 
removed from the mirror system</li>
+                                      
+                                    <li>
+                                        the 5.5.x branch in svn will move from 
<code>/tomcat/tc5.5.x</code> to
     <code>/tomcat/archive/tc5.5.x</code>
-</li>
-  
-<li>the links to the 5.5.x documentation will be removed from
+                                    </li>
+                                      
+                                    <li>the links to the 5.5.x documentation 
will be removed from
     tomcat.apache.org</li>
-  
-<li>The bugzilla project for 5.5.x will be made read-only</li>
-
-</ul>
-
-
-<p>Note that all 5.5.x releases will always be available from the archive.</p>
-
-
-<p>It is anticipated that the final 5.5.x release will be made shortly
+                                      
+                                    <li>The bugzilla project for 5.5.x will be 
made read-only</li>
+                                    
+                                </ul>
+                                
+                                <p>Note that all 5.5.x releases will always be 
available from the archive.</p>
+                                
+                                <p>It is anticipated that the final 5.5.x 
release will be made shortly
 before 30 September 2012.</p>
-
-
-</div>
-</div>
-</div>
-</div>
-</main>
-<footer id="footer">
-    Copyright &copy; 1999-2018, The Apache Software Foundation
-    <br>
-    Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
+                                
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </main>
+            <footer id="footer">
+                    Copyright &copy; 1999-2018, The Apache Software Foundation
+    
+                <br>
+                    Apache Tomcat, Tomcat, Apache, the Apache feather, and the 
Apache Tomcat
     project logo are either registered trademarks or trademarks of the Apache
     Software Foundation.
-  </footer>
-</div>
-<script src="res/js/tomcat.js"></script>
-</body>
+  
+            </footer>
+        </div>
+        <script src="res/js/tomcat.js"></script>
+    </body>
 </html>

Modified: tomcat/site/trunk/docs/tomcat-60-eol.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-60-eol.html?rev=1824755&r1=1824754&r2=1824755&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tomcat-60-eol.html (original)
+++ tomcat/site/trunk/docs/tomcat-60-eol.html Mon Feb 19 14:49:58 2018
@@ -1,267 +1,275 @@
 <!DOCTYPE html SYSTEM "about:legacy-compat">
 <html lang="en">
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<link href="res/css/tomcat.css" rel="stylesheet" type="text/css">
-<link href="res/css/fonts/fonts.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat&reg; - End of life for Apache Tomcat 6.0.x</title>
-<meta name="author" content="Apache Tomcat Project">
-</head>
-<body>
-<div id="wrapper">
-<header id="header">
-<div class="clearfix">
-<div class="menu-toggler pull-left" tabindex="1">
-<div class="hamburger"></div>
-</div>
-<a href="http://tomcat.apache.org/";><img class="tomcat-logo pull-left noPrint" 
alt="Tomcat Home" src="res/images/tomcat.png"></a>
-<h1 class="pull-left">Apache Tomcat<sup>&reg;</sup>
-</h1>
-<div class="asf-logos pull-right">
-<a href="https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left"><img 
src="https://www.apache.org/images/SupportApache-small.png"; class="support-asf" 
alt="Support Apache"></a><a href="http://www.apache.org/"; target="_blank" 
class="pull-left"><img src="res/images/asf_logo.svg" class="asf-logo" alt="The 
Apache Software Foundation"></a>
-</div>
-</div>
-</header>
-<main id="middle">
-<div>
-<div id="mainLeft">
-<div id="nav-wrapper">
-<form action="https://www.google.com/search"; method="get">
-<div class="searchbox">
-<input value="tomcat.apache.org" name="sitesearch" type="hidden"><input 
placeholder="Search&hellip;" required="required" name="q" id="query" 
type="search"><button>GO</button>
-</div>
-</form>
-<nav>
-<div>
-<h2>Apache Tomcat</h2>
-<ul>
-<li>
-<a href="./index.html">Home</a>
-</li>
-<li>
-<a href="./taglibs.html">Taglibs</a>
-</li>
-<li>
-<a href="./maven-plugin.html">Maven Plugin</a>
-</li>
-</ul>
-</div>
-<div>
-<h2>Download</h2>
-<ul>
-<li>
-<a href="./whichversion.html">Which version?</a>
-</li>
-<li>
-<a href="https://tomcat.apache.org/download-90.cgi";>Tomcat 9</a>
-</li>
-<li>
-<a href="https://tomcat.apache.org/download-80.cgi";>Tomcat 8</a>
-</li>
-<li>
-<a href="https://tomcat.apache.org/download-70.cgi";>Tomcat 7</a>
-</li>
-<li>
-<a href="https://tomcat.apache.org/download-connectors.cgi";>Tomcat 
Connectors</a>
-</li>
-<li>
-<a href="https://tomcat.apache.org/download-native.cgi";>Tomcat Native</a>
-</li>
-<li>
-<a href="https://tomcat.apache.org/download-taglibs.cgi";>Taglibs</a>
-</li>
-<li>
-<a href="https://archive.apache.org/dist/tomcat/";>Archives</a>
-</li>
-</ul>
-</div>
-<div>
-<h2>Documentation</h2>
-<ul>
-<li>
-<a href="./tomcat-9.0-doc/index.html">Tomcat 9.0</a>
-</li>
-<li>
-<a href="./tomcat-8.5-doc/index.html">Tomcat 8.5</a>
-</li>
-<li>
-<a href="./tomcat-8.0-doc/index.html">Tomcat 8.0</a>
-</li>
-<li>
-<a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
-</li>
-<li>
-<a href="./connectors-doc/">Tomcat Connectors</a>
-</li>
-<li>
-<a href="./native-doc/">Tomcat Native</a>
-</li>
-<li>
-<a href="https://wiki.apache.org/tomcat/FrontPage";>Wiki</a>
-</li>
-<li>
-<a href="./migration.html">Migration Guide</a>
-</li>
-<li>
-<a href="./presentations.html">Presentations</a>
-</li>
-</ul>
-</div>
-<div>
-<h2>Problems?</h2>
-<ul>
-<li>
-<a href="./security.html">Security Reports</a>
-</li>
-<li>
-<a href="./findhelp.html">Find help</a>
-</li>
-<li>
-<a href="https://wiki.apache.org/tomcat/FAQ";>FAQ</a>
-</li>
-<li>
-<a href="./lists.html">Mailing Lists</a>
-</li>
-<li>
-<a href="./bugreport.html">Bug Database</a>
-</li>
-<li>
-<a href="./irc.html">IRC</a>
-</li>
-</ul>
-</div>
-<div>
-<h2>Get Involved</h2>
-<ul>
-<li>
-<a href="./getinvolved.html">Overview</a>
-</li>
-<li>
-<a href="./svn.html">Source code</a>
-</li>
-<li>
-<a href="./ci.html">Buildbot</a>
-</li>
-<li>
-<a href="./tools.html">Tools</a>
-</li>
-</ul>
-</div>
-<div>
-<h2>Media</h2>
-<ul>
-<li>
-<a href="https://twitter.com/theapachetomcat";>Twitter</a>
-</li>
-<li>
-<a href="https://www.youtube.com/c/ApacheTomcatOfficial";>YouTube</a>
-</li>
-<li>
-<a href="https://blogs.apache.org/tomcat/";>Blog</a>
-</li>
-</ul>
-</div>
-<div>
-<h2>Misc</h2>
-<ul>
-<li>
-<a href="./whoweare.html">Who We Are</a>
-</li>
-<li>
-<a href="./heritage.html">Heritage</a>
-</li>
-<li>
-<a href="http://www.apache.org";>Apache Home</a>
-</li>
-<li>
-<a href="./resources.html">Resources</a>
-</li>
-<li>
-<a href="./contact.html">Contact</a>
-</li>
-<li>
-<a href="./legal.html">Legal</a>
-</li>
-<li>
-<a href="https://www.apache.org/foundation/contributing.html";>Support 
Apache</a>
-</li>
-<li>
-<a href="https://www.apache.org/foundation/sponsorship.html";>Sponsorship</a>
-</li>
-<li>
-<a href="http://www.apache.org/foundation/thanks.html";>Thanks</a>
-</li>
-</ul>
-</div>
-</nav>
-</div>
-</div>
-<div id="mainRight">
-<div id="content">
-<h2 style="display: none;">Content</h2>
-<h3 id="End_of_life_for_Apache_Tomcat_6.0.x">
-<span class="pull-right">2015-06-03</span> End of life for Apache Tomcat 
6.0.x</h3>
-<div class="text">
-
-<p>The Apache Tomcat team announces that support for Apache Tomcat 6.0.x
+    <head>
+        <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link href="res/css/tomcat.css" rel="stylesheet" type="text/css">
+        <link href="res/css/fonts/fonts.css" rel="stylesheet" type="text/css">
+        <title>Apache Tomcat&reg; - End of life for Apache Tomcat 6.0.x</title>
+        <meta name="author" content="Apache Tomcat Project">
+    </head>
+    <body>
+        <div id="wrapper">
+            <header id="header">
+                <div class="clearfix">
+                    <div class="menu-toggler pull-left" tabindex="1">
+                        <div class="hamburger"></div>
+                    </div>
+                    <a href="http://tomcat.apache.org/";><img 
class="tomcat-logo pull-left noPrint" alt="Tomcat Home" 
src="res/images/tomcat.png"></a>
+                    <h1 class="pull-left">
+                        Apache Tomcat<sup>&reg;</sup>
+                    </h1>
+                    <div class="asf-logos pull-right">
+                        <a 
href="https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left"><img 
src="https://www.apache.org/images/SupportApache-small.png"; class="support-asf" 
alt="Support Apache"></a><a href="http://www.apache.org/"; target="_blank" 
class="pull-left"><img src="res/images/asf_logo.svg" class="asf-logo" alt="The 
Apache Software Foundation"></a>
+                    </div>
+                </div>
+            </header>
+            <main id="middle">
+                <div>
+                    <div id="mainLeft">
+                        <div id="nav-wrapper">
+                            <form action="https://www.google.com/search"; 
method="get">
+                                <div class="searchbox">
+                                    <input value="tomcat.apache.org" 
name="sitesearch" type="hidden"><input placeholder="Search&hellip;" 
required="required" name="q" id="query" type="search"><button>GO</button>
+                                </div>
+                            </form>
+                            <nav>
+                                <div>
+                                    <h2>Apache Tomcat</h2>
+                                    <ul>
+                                        <li>
+                                            <a href="./index.html">Home</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="./taglibs.html">Taglibs</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="./maven-plugin.html">Maven Plugin</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <div>
+                                    <h2>TomcatCon</h2>
+                                    <ul>
+                                        <li>
+                                            <a 
href="./conference.html">Training, Manchester</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <div>
+                                    <h2>Download</h2>
+                                    <ul>
+                                        <li>
+                                            <a 
href="./whichversion.html">Which version?</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://tomcat.apache.org/download-90.cgi";>Tomcat 9</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://tomcat.apache.org/download-80.cgi";>Tomcat 8</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://tomcat.apache.org/download-70.cgi";>Tomcat 7</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://tomcat.apache.org/download-connectors.cgi";>Tomcat Connectors</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://tomcat.apache.org/download-native.cgi";>Tomcat Native</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://tomcat.apache.org/download-taglibs.cgi";>Taglibs</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://archive.apache.org/dist/tomcat/";>Archives</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <div>
+                                    <h2>Documentation</h2>
+                                    <ul>
+                                        <li>
+                                            <a 
href="./tomcat-9.0-doc/index.html">Tomcat 9.0</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="./tomcat-8.5-doc/index.html">Tomcat 8.5</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="./tomcat-8.0-doc/index.html">Tomcat 8.0</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
+                                        </li>
+                                        <li>
+                                            <a href="./connectors-doc/">Tomcat 
Connectors</a>
+                                        </li>
+                                        <li>
+                                            <a href="./native-doc/">Tomcat 
Native</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://wiki.apache.org/tomcat/FrontPage";>Wiki</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="./migration.html">Migration Guide</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="./presentations.html">Presentations</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <div>
+                                    <h2>Problems?</h2>
+                                    <ul>
+                                        <li>
+                                            <a href="./security.html">Security 
Reports</a>
+                                        </li>
+                                        <li>
+                                            <a href="./findhelp.html">Find 
help</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://wiki.apache.org/tomcat/FAQ";>FAQ</a>
+                                        </li>
+                                        <li>
+                                            <a href="./lists.html">Mailing 
Lists</a>
+                                        </li>
+                                        <li>
+                                            <a href="./bugreport.html">Bug 
Database</a>
+                                        </li>
+                                        <li>
+                                            <a href="./irc.html">IRC</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <div>
+                                    <h2>Get Involved</h2>
+                                    <ul>
+                                        <li>
+                                            <a 
href="./getinvolved.html">Overview</a>
+                                        </li>
+                                        <li>
+                                            <a href="./svn.html">Source 
code</a>
+                                        </li>
+                                        <li>
+                                            <a href="./ci.html">Buildbot</a>
+                                        </li>
+                                        <li>
+                                            <a href="./tools.html">Tools</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <div>
+                                    <h2>Media</h2>
+                                    <ul>
+                                        <li>
+                                            <a 
href="https://twitter.com/theapachetomcat";>Twitter</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://www.youtube.com/c/ApacheTomcatOfficial";>YouTube</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://blogs.apache.org/tomcat/";>Blog</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <div>
+                                    <h2>Misc</h2>
+                                    <ul>
+                                        <li>
+                                            <a href="./whoweare.html">Who We 
Are</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="./heritage.html">Heritage</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="http://www.apache.org";>Apache Home</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="./resources.html">Resources</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="./contact.html">Contact</a>
+                                        </li>
+                                        <li>
+                                            <a href="./legal.html">Legal</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://www.apache.org/foundation/contributing.html";>Support Apache</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://www.apache.org/foundation/sponsorship.html";>Sponsorship</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                            </nav>
+                        </div>
+                    </div>
+                    <div id="mainRight">
+                        <div id="content">
+                            <h2 style="display: none;">Content</h2>
+                            <h3 id="End_of_life_for_Apache_Tomcat_6.0.x">
+                                <span class="pull-right">2015-06-03</span> End 
of life for Apache Tomcat 6.0.x
+                            </h3>
+                            <div class="text">
+                                
+                                <p>The Apache Tomcat team announces that 
support for Apache Tomcat 6.0.x
 will end on 31 December 2016.</p>
-
-
-<p>This means that after 31 December 2016:</p>
-
-<ul>
-  
-<li>releases from the 6.0.x branch are highly unlikely</li>
-  
-<li>bugs affecting only the 6.0.x branch will not be addressed</li>
-  
-<li>security vulnerability reports will not be checked against the 6.0.x
+                                
+                                <p>This means that after 31 December 2016:</p>
+                                
+                                <ul>
+                                      
+                                    <li>releases from the 6.0.x branch are 
highly unlikely</li>
+                                      
+                                    <li>bugs affecting only the 6.0.x branch 
will not be addressed</li>
+                                      
+                                    <li>security vulnerability reports will 
not be checked against the 6.0.x
     branch</li>
-
-</ul>
-
-
-<p>Three months later (i.e. some time after 30 March 2017)</p>
-
-<ul>
-  
-<li>the 6.0.x download pages will be removed</li>
-  
-<li>the latest 6.0.x release will be removed from the mirror system</li>
-  
-<li>the 6.0.x branch in svn will move from <code>/tomcat/tc6.0.x</code> to
+                                    
+                                </ul>
+                                
+                                <p>Three months later (i.e. some time after 30 
March 2017)</p>
+                                
+                                <ul>
+                                      
+                                    <li>the 6.0.x download pages will be 
removed</li>
+                                      
+                                    <li>the latest 6.0.x release will be 
removed from the mirror system</li>
+                                      
+                                    <li>
+                                        the 6.0.x branch in svn will move from 
<code>/tomcat/tc6.0.x</code> to
     <code>/tomcat/archive/tc6.0.x</code>
-</li>
-  
-<li>the links to the 6.0.x documentation will be removed from
+                                    </li>
+                                      
+                                    <li>the links to the 6.0.x documentation 
will be removed from
     tomcat.apache.org</li>
-  
-<li>The bugzilla project for 6.0.x will be made read-only</li>
-
-</ul>
-
-
-<p>Note that all 6.0.x releases will always be available from the archive.</p>
-
-
-<p>It is anticipated that the final 6.0.x release will be made shortly
+                                      
+                                    <li>The bugzilla project for 6.0.x will be 
made read-only</li>
+                                    
+                                </ul>
+                                
+                                <p>Note that all 6.0.x releases will always be 
available from the archive.</p>
+                                
+                                <p>It is anticipated that the final 6.0.x 
release will be made shortly
 before 31 December 2016.</p>
-
-
-</div>
-</div>
-</div>
-</div>
-</main>
-<footer id="footer">
-    Copyright &copy; 1999-2018, The Apache Software Foundation
-    <br>
-    Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
+                                
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </main>
+            <footer id="footer">
+                    Copyright &copy; 1999-2018, The Apache Software Foundation
+    
+                <br>
+                    Apache Tomcat, Tomcat, Apache, the Apache feather, and the 
Apache Tomcat
     project logo are either registered trademarks or trademarks of the Apache
     Software Foundation.
-  </footer>
-</div>
-<script src="res/js/tomcat.js"></script>
-</body>
+  
+            </footer>
+        </div>
+        <script src="res/js/tomcat.js"></script>
+    </body>
 </html>



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

Reply via email to