Modified: tomcat/site/trunk/docs/whichversion.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1824755&r1=1824754&r2=1824755&view=diff
==============================================================================
--- tomcat/site/trunk/docs/whichversion.html (original)
+++ tomcat/site/trunk/docs/whichversion.html Mon Feb 19 14:49:58 2018
@@ -1,224 +1,232 @@
 <!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; - Which Version Do I Want?</title>
-<meta name="author" content="Marc A. Saegesser">
-<meta name="author" content="Yoav Shapira">
-<meta name="author" content="Jean-Frederic Clere">
-</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_Tomcat_Versions">Apache Tomcat Versions</h3>
-<div class="text">
-
-<p>Apache Tomcat<sup>&reg;</sup> is an open source software implementation of 
the Java Servlet
+    <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; - Which Version Do I Want?</title>
+        <meta name="author" content="Marc A. Saegesser">
+        <meta name="author" content="Yoav Shapira">
+        <meta name="author" content="Jean-Frederic Clere">
+    </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_Tomcat_Versions">Apache Tomcat 
Versions</h3>
+                            <div class="text">
+                                
+                                <p>
+                                    Apache Tomcat<sup>&reg;</sup> is an open 
source software implementation of the Java Servlet
 and JavaServer Pages technologies. Different versions of Apache Tomcat are
 available for different versions of the Servlet and JSP specifications. The
 mapping between <a href="https://wiki.apache.org/tomcat/Specifications";>the 
specifications</a>
 and the respective Apache Tomcat versions is:
-</p>
-
 
-<table class="detail-table">
-
-
-<tr>
-  
-<th><strong>Servlet Spec</strong></th>
+                                </p>
+                                
+                                <table class="detail-table">
+                                    
+                                    <tr>
+                                          <th><strong>Servlet 
Spec</strong></th>
   <th><strong>JSP Spec</strong></th>
   <th><strong>EL Spec</strong></th>
   <th><strong>WebSocket Spec</strong></th>
@@ -227,12 +235,10 @@ and the respective Apache Tomcat version
   <th><strong>Latest Released Version</strong></th>
   <th><strong>Supported Java Versions</strong></th>
 
-</tr>
-
-
-<tr>
-  
-<td>4.0</td>
+                                    </tr>
+                                    
+                                    <tr>
+                                          <td>4.0</td>
   <td>2.3</td>
   <td>3.0</td>
   <td>1.1</td>
@@ -241,12 +247,10 @@ and the respective Apache Tomcat version
   <td>9.0.5</td>
   <td>8 and later</td>
 
-</tr>
-
-
-<tr>
-  
-<td>3.1</td>
+                                    </tr>
+                                    
+                                    <tr>
+                                          <td>3.1</td>
   <td>2.3</td>
   <td>3.0</td>
   <td>1.1</td>
@@ -255,12 +259,10 @@ and the respective Apache Tomcat version
   <td>8.5.28</td>
   <td>7 and later</td>
 
-</tr>
-
-
-<tr>
-  
-<td>3.1</td>
+                                    </tr>
+                                    
+                                    <tr>
+                                          <td>3.1</td>
   <td>2.3</td>
   <td>3.0</td>
   <td>1.1</td>
@@ -269,26 +271,24 @@ and the respective Apache Tomcat version
   <td>8.0.50 (superseded)</td>
   <td>7 and later</td>
 
-</tr>
-
-
-<tr>
-  
-<td>3.0</td>
+                                    </tr>
+                                    
+                                    <tr>
+                                          <td>3.0</td>
   <td>2.2</td>
   <td>2.2</td>
   <td>1.1</td>
   <td>N/A</td>
   <td>7.0.x</td>
   <td>7.0.85</td>
-  <td>6 and later<br> (7 and later for WebSocket)</td>
-
-</tr>
-
-
-<tr>
-  
-<td>2.5</td>
+  <td>6 and later
+                                            <br>
+                                             (7 and later for WebSocket)</td>
+
+                                    </tr>
+                                    
+                                    <tr>
+                                          <td>2.5</td>
   <td>2.1</td>
   <td>2.1</td>
   <td>N/A</td>
@@ -297,12 +297,10 @@ and the respective Apache Tomcat version
   <td>6.0.53 (archived)</td>
   <td>5 and later</td>
 
-</tr>
-
-
-<tr>
-  
-<td>2.4</td>
+                                    </tr>
+                                    
+                                    <tr>
+                                          <td>2.4</td>
   <td>2.0</td>
   <td>N/A</td>
   <td>N/A</td>
@@ -311,12 +309,10 @@ and the respective Apache Tomcat version
   <td>5.5.36 (archived)</td>
   <td>1.4 and later</td>
 
-</tr>
-
-
-<tr>
-  
-<td>2.3</td>
+                                    </tr>
+                                    
+                                    <tr>
+                                          <td>2.3</td>
   <td>1.2</td>
   <td>N/A</td>
   <td>N/A</td>
@@ -325,12 +321,10 @@ and the respective Apache Tomcat version
   <td>4.1.40 (archived)</td>
   <td>1.3 and later</td>
 
-</tr>
-
-
-<tr>
-  
-<td>2.2</td>
+                                    </tr>
+                                    
+                                    <tr>
+                                          <td>2.2</td>
   <td>1.1</td>
   <td>N/A</td>
   <td>N/A</td>
@@ -339,44 +333,41 @@ and the respective Apache Tomcat version
   <td>3.3.2 (archived)</td>
   <td>1.1 and later</td>
 
-</tr>
-
-
-</table>
-
-
-<p>Each version of Tomcat is supported for any stable Java release that meets
+                                    </tr>
+                                    
+                                </table>
+                                
+                                <p>Each version of Tomcat is supported for any 
stable Java release that meets
 the requirements of the final column in the table above.</p>
-
-
-<p>Tomcat should also work on any Java early access build that meets the
+                                
+                                <p>Tomcat should also work on any Java early 
access build that meets the
 requirements of the final column in the table above. For example, users were
 successfully running Tomcat 8 on Java 8 many months before the first stable 
Java
 8 release. However, users of early access builds should be aware of the
 following:</p>
-
-<ul>
-
-<li>It is not unusual for the initial early access builds to contain bugs that
+                                
+                                <ul>
+                                    
+                                    <li>It is not unusual for the initial 
early access builds to contain bugs that
     can cause problems for web applications running on Tomcat.</li>
-
-<li>If the new Java version introduces new language features then the default
+                                    
+                                    <li>If the new Java version introduces new 
language features then the default
     JSP compiler may not support them immediately. Switching the JSP compiler 
to
     javac may enable these new language features to be used in JSPs.</li>
-
-<li>If you do discover an problem using a Java early access build, please
+                                    
+                                    <li>
+                                        If you do discover an problem using a 
Java early access build, please
     <a href="findhelp.html">ask for help</a>. The Tomcat user's mailing
-    list is probably the best place to start.</li>
-
-</ul>
-
-
-<p>The releases are described in more detail below to help you determine
+    list is probably the best place to start.
+                                    </li>
+                                    
+                                </ul>
+                                
+                                <p>The releases are described in more detail 
below to help you determine
 which one is right for you.  More details about each release can be found in
 the associated release notes.</p>
-
-
-<p>Please note that although we offer downloads and documentation of older
+                                
+                                <p>Please note that although we offer 
downloads and documentation of older
 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
@@ -384,109 +375,106 @@ still offered on the mailing list for us
 of the community-driven support approach, the older your version, fewer people
 will be interested or able to support you.
 </p>
-
-
-</div>
-<h3 id="Alpha_/_Beta_/_Stable">Alpha / Beta / Stable</h3>
-<div class="text">
-
-
-<p>When voting for a release, reviewers specify the stability level that they
+                                
+                            </div>
+                            <h3 id="Alpha_/_Beta_/_Stable">Alpha / Beta / 
Stable</h3>
+                            <div class="text">
+                                
+                                <p>When voting for a release, reviewers 
specify the stability level that they
 consider the release has reached. Initial releases of a new major version
 typically process from Alpha, through Beta to Stable over a period of several
 months. However, the Stable level is only available once the Java 
specifications
 the release implements have been finalised. This means a release that in all
 other respects is considered stable, may still be labelled as Beta if the
 specifications are not final.</p>
-
-
-<p>The download pages will always show the latest stable release and any newer
+                                
+                                <p>The download pages will always show the 
latest stable release and any newer
 Alpha or Beta release if one exists. Alpha and beta releases are always clearly
 marked on the download pages.</p>
-
-
-<p>Stability is a subjective judgement and you should always read carefully the
+                                
+                                <p>
+                                    Stability is a subjective judgement and 
you should always read carefully the
 release notes for any version you intend to make use of.  If you are an early
 adopter of a release, we would love to hear your opinion about its stability as
 part of the vote: it takes place on the <a href="lists.html">development 
mailing
-list</a>.</p>
-
-
-<p>
-<strong>Alpha</strong> releases may contain large amounts of untested/missing
+list</a>.
+                                </p>
+                                
+                                <p>
+                                    <strong>Alpha</strong> releases may 
contain large amounts of untested/missing
 functionality required by the specification and/or significant bugs and are not
-expected to run stably for any length of time.</p>
-
-
-<p>
-<strong>Beta</strong> releases may contain some untested functionality and/or
+expected to run stably for any length of time.
+                                </p>
+                                
+                                <p>
+                                    <strong>Beta</strong> releases may contain 
some untested functionality and/or
 a number of relatively minor bugs. Beta releases are not expected to run 
stably.
-</p>
-
 
-<p>
-<strong>Stable</strong> releases may contain a small number of relatively
+                                </p>
+                                
+                                <p>
+                                    <strong>Stable</strong> releases may 
contain a small number of relatively
 minor bugs. Stable releases are intended for production use and are expected to
-run stably for extended periods of time.</p>
-
-
-</div>
-<h3 id="Apache_Tomcat_9.x">Apache Tomcat 9.x</h3>
-<div class="text">
-
-
-<p>
-<strong>Apache Tomcat 9.x</strong> is the current focus of development. It
+run stably for extended periods of time.
+                                </p>
+                                
+                            </div>
+                            <h3 id="Apache_Tomcat_9.x">Apache Tomcat 9.x</h3>
+                            <div class="text">
+                                
+                                <p>
+                                    <strong>Apache Tomcat 9.x</strong> is the 
current focus of development. It
 builds on Tomcat 8.0.x and 8.5.x and implements the <strong>Servlet
 4.0</strong>, <strong>JSP 2.3</strong>, <strong>EL 3.0</strong>, 
<strong>WebSocket 1.1
 </strong> and <strong>JASPIC 1.1</strong> specifications (the versions 
required by
 Java EE 8 platform). In addition to this, it includes
 the following significant improvements:
-</p>
-
-<ul>
 
-<li>Adds support for HTTP/2 (requires either running on Java 9 (since Apache 
Tomcat
+                                </p>
+                                
+                                <ul>
+                                    
+                                    <li>
+                                        Adds support for HTTP/2 (requires 
either running on Java 9 (since Apache Tomcat
     9.0.0.M18) or the <a href="/native-doc/">Tomcat Native</a> library being 
installed)
-</li>
 
-<li>Adds support for using OpenSSL for TLS support with the JSSE connectors
+                                    </li>
+                                    
+                                    <li>Adds support for using OpenSSL for TLS 
support with the JSSE connectors
     (NIO and NIO2) </li>
-
-<li>Adds support for TLS virtual hosting (SNI)</li>
-
-</ul>
-
-
-</div>
-<h3 id="Apache_Tomcat_8.x">Apache Tomcat 8.x</h3>
-<div class="text">
-
-
-<p>
-<strong>Apache Tomcat 8.0.x</strong> builds on Tomcat 7.0.x and implements the
+                                    
+                                    <li>Adds support for TLS virtual hosting 
(SNI)</li>
+                                    
+                                </ul>
+                                
+                            </div>
+                            <h3 id="Apache_Tomcat_8.x">Apache Tomcat 8.x</h3>
+                            <div class="text">
+                                
+                                <p>
+                                    <strong>Apache Tomcat 8.0.x</strong> 
builds on Tomcat 7.0.x and implements the
 <strong>Servlet 3.1</strong>, <strong>JSP 2.3</strong>, <strong>EL 3.0</strong>
 and <strong>WebSocket 1.1</strong> specifications. In addition
 to that, it includes the following significant improvements:
-</p>
-
-<ul>
 
-<li>A single, common resources implementation to replace the multiple resource
+                                </p>
+                                
+                                <ul>
+                                    
+                                    <li>A single, common resources 
implementation to replace the multiple resource
     extension features provided in earlier versions.</li>
-
-</ul>
-
-
-<p>
-
-<strong>Apache Tomcat 8.5.x</strong> supports the same Servlet, JSP, EL, and
+                                    
+                                </ul>
+                                
+                                <p>
+                                    
+                                    <strong>Apache Tomcat 8.5.x</strong> 
supports the same Servlet, JSP, EL, and
 WebSocket Specification versions as Apache Tomcat 8.0.x. In addition to that,
 it also implements the <strong>JASPIC 1.1</strong> specification.
-</p>
-
 
-<p>
+                                </p>
+                                
+                                <p>
 It was created in March 2016 as a fork from Tomcat 9.0.0.M4 (alpha)
 milestone release. It provides HTTP/2 support and other features from
 Tomcat 9.x codebase, while being compatible with Tomcat 8.0 runtime and
@@ -494,265 +482,260 @@ specification requirements. (A stable re
 created at that time, as Java EE specifications targeted by Tomcat 9 were
 finalized only a few years later).
 </p>
-
-
-<p>Tomcat 8.5 is thought as a replacement for Tomcat 8.0. Please refer to
+                                
+                                <p>
+                                    Tomcat 8.5 is thought as a replacement for 
Tomcat 8.0. Please refer to
 <a href="/migration.html">Migration guide</a> for guidance on migrating to
-Tomcat 8.5.</p>
-
-
-<p>
+Tomcat 8.5.
+                                </p>
+                                
+                                <p>
 Apache Tomcat 8.5.x includes the following significant improvements:
 </p>
-
-
-<ul>
-
-<li>Adds support for HTTP/2 (requires the <a href="/native-doc/">Tomcat 
Native</a> library)</li>
-
-<li>Adds support for using OpenSSL for TLS support with the JSSE connectors
+                                
+                                <ul>
+                                    
+                                    <li>
+                                        Adds support for HTTP/2 (requires the 
<a href="/native-doc/">Tomcat Native</a> library)
+                                    </li>
+                                    
+                                    <li>Adds support for using OpenSSL for TLS 
support with the JSSE connectors
     (NIO and NIO2) </li>
-
-<li>Adds support for TLS virtual hosting (SNI)</li>
-
-</ul>
-
-
-<p>The following technologies were removed in Apache Tomcat 8.5.x:</p>
-
-
-<ul>
-
-<li>BIO implementation of HTTP and AJP connectors</li>
-
-<li>Support for Comet API</li>
-
-</ul>
-
-
-<p>There are significant changes in many areas under the hood, resulting in
+                                    
+                                    <li>Adds support for TLS virtual hosting 
(SNI)</li>
+                                    
+                                </ul>
+                                
+                                <p>The following technologies were removed in 
Apache Tomcat 8.5.x:</p>
+                                
+                                <ul>
+                                    
+                                    <li>BIO implementation of HTTP and AJP 
connectors</li>
+                                    
+                                    <li>Support for Comet API</li>
+                                    
+                                </ul>
+                                
+                                <p>There are significant changes in many areas 
under the hood, resulting in
 improved performance, stability, and total cost of ownership.  Please refer
 to the Apache Tomcat 8.5 Changelog for details.
 </p>
-
-
-<p>Users of Tomcat 8.0 should be aware that Tomcat 8.0 has now reached
+                                
+                                <p>
+                                    Users of Tomcat 8.0 should be aware that 
Tomcat 8.0 has now reached
 <a href="tomcat-80-eol.html">end of life</a>. Users of Tomcat 8.0.x should
-upgrade to Tomcat 8.5.x or later.</p>
-
-
-</div>
-<h3 id="Apache_Tomcat_7.x">Apache Tomcat 7.x</h3>
-<div class="text">
-
-
-<p>
-<strong>Apache Tomcat 7.x</strong> builds upon the improvements made in
+upgrade to Tomcat 8.5.x or later.
+                                </p>
+                                
+                            </div>
+                            <h3 id="Apache_Tomcat_7.x">Apache Tomcat 7.x</h3>
+                            <div class="text">
+                                
+                                <p>
+                                    <strong>Apache Tomcat 7.x</strong> builds 
upon the improvements made in
 Tomcat 6.0.x and implements the <strong>Servlet 3.0</strong>,
 <strong>JSP 2.2</strong>, <strong>EL 2.2</strong> and
 <strong>WebSocket 1.1</strong> specifications. In addition
 to that, it includes the following improvements:
-</p>
-
-<ul>
-
-<li>Web application memory leak detection and prevention</li>
 
-<li>Improved security for the Manager and Host Manager applications</li>
-
-<li>Generic CSRF protection</li>
-
-<li>Support for including external content directly in a web application</li>
-
-<li>Refactoring (connectors, lifecycle) and lots of internal code clean-up</li>
-
-</ul>
-
-
-</div>
-<h3 id="Apache_Tomcat_6.x">Apache Tomcat 6.x</h3>
-<div class="text">
-
-
-<p>
-<strong>Apache Tomcat 6.x</strong> builds upon the improvements made in
+                                </p>
+                                
+                                <ul>
+                                    
+                                    <li>Web application memory leak detection 
and prevention</li>
+                                    
+                                    <li>Improved security for the Manager and 
Host Manager applications</li>
+                                    
+                                    <li>Generic CSRF protection</li>
+                                    
+                                    <li>Support for including external content 
directly in a web application</li>
+                                    
+                                    <li>Refactoring (connectors, lifecycle) 
and lots of internal code clean-up</li>
+                                    
+                                </ul>
+                                
+                            </div>
+                            <h3 id="Apache_Tomcat_6.x">Apache Tomcat 6.x</h3>
+                            <div class="text">
+                                
+                                <p>
+                                    <strong>Apache Tomcat 6.x</strong> builds 
upon the improvements made in
 Tomcat 5.5.x and implements the <strong>Servlet 2.5</strong> and
 <strong>JSP 2.1</strong> specifications. In addition to that, it includes the
 following improvements:
-</p>
-
-<ul>
-
-<li>Memory usage optimizations</li>
-
-<li>Advanced IO capabilities</li>
 
-<li>Refactored clustering</li>
-
-</ul>
-
-
-<p>Users of Tomcat 6 should be aware that Tomcat 6 has now reached
+                                </p>
+                                
+                                <ul>
+                                    
+                                    <li>Memory usage optimizations</li>
+                                    
+                                    <li>Advanced IO capabilities</li>
+                                    
+                                    <li>Refactored clustering</li>
+                                    
+                                </ul>
+                                
+                                <p>
+                                    Users of Tomcat 6 should be aware that 
Tomcat 6 has now reached
 <a href="tomcat-60-eol.html">end of life</a>. Users of Tomcat 6.x should
-upgrade to Tomcat 7.x or later.</p>
-
-
-</div>
-<h3 id="Apache_Tomcat_5.x">Apache Tomcat 5.x</h3>
-<div class="text">
-
-
-<p>
-<strong>Apache Tomcat 5.x</strong> is available for download from the
-archives.</p>
-
-
-<p>
-<strong>Apache Tomcat 5.5.x</strong> supports the same Servlet and JSP
+upgrade to Tomcat 7.x or later.
+                                </p>
+                                
+                            </div>
+                            <h3 id="Apache_Tomcat_5.x">Apache Tomcat 5.x</h3>
+                            <div class="text">
+                                
+                                <p>
+                                    <strong>Apache Tomcat 5.x</strong> is 
available for download from the
+archives.
+                                </p>
+                                
+                                <p>
+                                    <strong>Apache Tomcat 5.5.x</strong> 
supports the same Servlet and JSP
 Specification versions as Apache Tomcat 5.0.x. There are significant changes
 in many areas under the hood, resulting in improved performance, stability,
 and total cost of ownership.  Please refer to the Apache Tomcat 5.5 Changelog
 for details.
-</p>
-
-
-<p>
-<strong>Apache Tomcat 5.0.x</strong> improves on Apache Tomcat 4.1 in many
-ways, including:</p>
 
-<ul>
-
-<li>Performance optimizations and reduced garbage collection</li>
-
-<li>Refactored application deployer, with an optional standalone deployer
+                                </p>
+                                
+                                <p>
+                                    <strong>Apache Tomcat 5.0.x</strong> 
improves on Apache Tomcat 4.1 in many
+ways, including:
+                                </p>
+                                
+                                <ul>
+                                    
+                                    <li>Performance optimizations and reduced 
garbage collection</li>
+                                    
+                                    <li>Refactored application deployer, with 
an optional standalone deployer
 allowing validation and compilation of a web application before putting
 it in production</li>
-
-<li>Complete server monitoring using JMX and the manager web application</li>
-
-<li>Scalability and reliability enhancements</li>
-
-<li>Improved Taglibs handling, including advanced pooling and tag plugins</li>
-
-<li>Improved platform integration, with native Windows and Unix wrappers</li>
-
-<li>Embedding using JMX</li>
-
-<li>Enhanced Security Manager support</li>
-
-<li>Integrated session clustering</li>
-
-<li>Expanded documentation</li>
-
-</ul>
-
-
-<p>Users of Tomcat 5 should be aware that Tomcat 5 has now reached
+                                    
+                                    <li>Complete server monitoring using JMX 
and the manager web application</li>
+                                    
+                                    <li>Scalability and reliability 
enhancements</li>
+                                    
+                                    <li>Improved Taglibs handling, including 
advanced pooling and tag plugins</li>
+                                    
+                                    <li>Improved platform integration, with 
native Windows and Unix wrappers</li>
+                                    
+                                    <li>Embedding using JMX</li>
+                                    
+                                    <li>Enhanced Security Manager support</li>
+                                    
+                                    <li>Integrated session clustering</li>
+                                    
+                                    <li>Expanded documentation</li>
+                                    
+                                </ul>
+                                
+                                <p>
+                                    Users of Tomcat 5 should be aware that 
Tomcat 5 has now reached
 <a href="tomcat-55-eol.html">end of life</a>. Users of Tomcat 5.x should
-upgrade to Tomcat 7.x or later.</p>
-
-
-</div>
-<h3 id="Apache_Tomcat_4.x">Apache Tomcat 4.x</h3>
-<div class="text">
-
-
-<p>
-<strong>Apache Tomcat 4.x</strong> is available for download from the
-archives.</p>
-
-
-<p>
-<strong>Apache Tomcat 4.x</strong> implements a new servlet container (called
+upgrade to Tomcat 7.x or later.
+                                </p>
+                                
+                            </div>
+                            <h3 id="Apache_Tomcat_4.x">Apache Tomcat 4.x</h3>
+                            <div class="text">
+                                
+                                <p>
+                                    <strong>Apache Tomcat 4.x</strong> is 
available for download from the
+archives.
+                                </p>
+                                
+                                <p>
+                                    <strong>Apache Tomcat 4.x</strong> 
implements a new servlet container (called
 Catalina) that is based on completely new architecture.  The 4.x releases
 implement the <strong>Servlet 2.3</strong> and <strong>JSP 1.2</strong>
-specifications.</p>
-
-
-<p>
-<strong>Apache Tomcat 4.1.x</strong> is a refactoring
-of Apache Tomcat 4.0.x, and contains significant enhancements, including:</p>
-
-<ul>
-
-<li>JMX based administration features</li>
-
-<li>JSP and Struts based administration web application</li>
-
-<li>New Coyote connector (HTTP/1.1, AJP 1.3 and JNI support)</li>
-
-<li>Rewritten Jasper JSP page compiler</li>
-
-<li>Performance and memory efficiency improvements</li>
-
-<li>Enhanced manager application support for integration with development
+specifications.
+                                </p>
+                                
+                                <p>
+                                    <strong>Apache Tomcat 4.1.x</strong> is a 
refactoring
+of Apache Tomcat 4.0.x, and contains significant enhancements, including:
+                                </p>
+                                
+                                <ul>
+                                    
+                                    <li>JMX based administration features</li>
+                                    
+                                    <li>JSP and Struts based administration 
web application</li>
+                                    
+                                    <li>New Coyote connector (HTTP/1.1, AJP 
1.3 and JNI support)</li>
+                                    
+                                    <li>Rewritten Jasper JSP page compiler</li>
+                                    
+                                    <li>Performance and memory efficiency 
improvements</li>
+                                    
+                                    <li>Enhanced manager application support 
for integration with development
 tools</li>
-
-<li>Custom Ant tasks to interact with the manager application directly
+                                    
+                                    <li>Custom Ant tasks to interact with the 
manager application directly
 from build.xml scripts</li>
-
-</ul>
-
-
-<p>
-<strong>Apache Tomcat 4.0.x</strong>.  Apache Tomcat 4.0.6 is the old 
production
+                                    
+                                </ul>
+                                
+                                <p>
+                                    <strong>Apache Tomcat 4.0.x</strong>.  
Apache Tomcat 4.0.6 is the old production
 quality release.  The 4.0 servlet
 container (Catalina) has been developed from the ground up for flexibility and
 performance.  Version 4.0 implements the final released versions of the Servlet
 2.3 and JSP 1.2 specifications.  As required by the specifications, Apache 
Tomcat 4.0
 also supports web applications built for the Servlet 2.2 and JSP 1.1
-specifications with no changes.</p>
-
-
-<p>Users of Tomcat 4 should be aware that Tomcat 4 has now reached
+specifications with no changes.
+                                </p>
+                                
+                                <p>Users of Tomcat 4 should be aware that 
Tomcat 4 has now reached
 end of life. Users of Tomcat 4.x should upgrade to Tomcat 7.x or
 later.</p>
-
-
-</div>
-<h3 id="Apache_Tomcat_3.x">Apache Tomcat 3.x</h3>
-<div class="text">
-
-
-<p>
-<strong>Apache Tomcat 3.x</strong> is available for download from the
-archives.</p>
-
-
-<ul>
-
-<li>Version <strong>3.3</strong> is the current production quality release for
+                                
+                            </div>
+                            <h3 id="Apache_Tomcat_3.x">Apache Tomcat 3.x</h3>
+                            <div class="text">
+                                
+                                <p>
+                                    <strong>Apache Tomcat 3.x</strong> is 
available for download from the
+archives.
+                                </p>
+                                
+                                <ul>
+                                    
+                                    <li>
+                                        Version <strong>3.3</strong> is the 
current production quality release for
 the Servlet 2.2 and JSP 1.1 specifications.  Apache Tomcat 3.3 is the latest
 continuation of the Apache Tomcat 3.x architecture; it is more advanced then 
3.2.4,
-which is the 'old' production quality release.</li>
-
-<li>Version 3.2.4 is the 'old' production quality release and is now in
+which is the 'old' production quality release.
+                                    </li>
+                                    
+                                    <li>Version 3.2.4 is the 'old' production 
quality release and is now in
 maintenance only mode.</li>
-
-<li>Version 3.1.1 is a legacy release.</li>
-
-</ul>
-
-
-<p>
-All <strong>Apache Tomcat 3.x</strong> releases trace their heritage back to 
the
+                                    
+                                    <li>Version 3.1.1 is a legacy release.</li>
+                                    
+                                </ul>
+                                
+                                <p>
+                                    All <strong>Apache Tomcat 3.x</strong> 
releases trace their heritage back to the
 original Servlet and JSP implementations that Sun donated to the Apache
 Software Foundation.  The 3.x versions all implement the <strong>Servlet
 2.2</strong> and <strong>JSP 1.1</strong> specifications.
-</p>
-
 
-<p>
-<strong>Apache Tomcat 3.3.x</strong>. Version 3.3.2 is the current production
+                                </p>
+                                
+                                <p>
+                                    <strong>Apache Tomcat 3.3.x</strong>. 
Version 3.3.2 is the current production
 quality release. It continues the refactoring that was begun in version 3.2 and
 carries it to its logical conclusion.  Version 3.3 provides a much more modular
 design and allows the servlet container to be customized by adding and removing
 modules that control the processing of servlet requests.  This version also
-contains many performance improvements.</p>
-
-
-<p>
-<strong>Apache Tomcat 3.2.x</strong>.  Version 3.2 added few new features
+contains many performance improvements.
+                                </p>
+                                
+                                <p>
+                                    <strong>Apache Tomcat 3.2.x</strong>.  
Version 3.2 added few new features
 since 3.1; the major effort was a refactoring of the internals to improve
 performance and stability.  The 3.2.1 release, like 3.1.1, was a security
 patch.  Version 3.2.2 fixed a large number of bugs and all known
@@ -760,42 +743,43 @@ specification compliance issues.  Versio
 closes a serious security hole.  Version 3.2.4 is a minor bug fix release.
 All users of Apache Tomcat versions prior to 3.2.3 should upgrade as soon as
 possible.  With the exception of fixes for critical security related bugs,
-development on the Apache Tomcat 3.2.x branch has stopped.</p>
-
-
-<p>
-<strong>Apache Tomcat 3.1.x</strong>.  The 3.1 release contained several
+development on the Apache Tomcat 3.2.x branch has stopped.
+                                </p>
+                                
+                                <p>
+                                    <strong>Apache Tomcat 3.1.x</strong>.  The 
3.1 release contained several
 improvements over Apache Tomcat 3.0, including servlet reloading, WAR file
 support and added connectors for the IIS and Netscape web servers.  The
 latest maintenance release, 3.1.1, contained fixes for security problems.
 There is no active development ongoing for Apache Tomcat 3.1.x.  Users of 
Apache Tomcat
 3.1 should update to 3.1.1 to close the security holes and they are
 strongly encouraged to migrate to the current production release, Apache Tomcat
-3.3.</p>
-
-
-<p>
-<strong>Apache Tomcat 3.0.x</strong>. Initial Apache Tomcat release.</p>
-
-
-<p>Users of Tomcat 3 should be aware that Tomcat 3 has now reached
+3.3.
+                                </p>
+                                
+                                <p>
+                                    <strong>Apache Tomcat 3.0.x</strong>. 
Initial Apache Tomcat release.
+                                </p>
+                                
+                                <p>Users of Tomcat 3 should be aware that 
Tomcat 3 has now reached
 end of life. Users of Tomcat 3.x should upgrade to Tomcat 7.x or
 later.</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/whoweare.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whoweare.html?rev=1824755&r1=1824754&r2=1824755&view=diff
==============================================================================
--- tomcat/site/trunk/docs/whoweare.html (original)
+++ tomcat/site/trunk/docs/whoweare.html Mon Feb 19 14:49:58 2018
@@ -1,219 +1,228 @@
 <!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; - Who We Are</title>
-</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="Who_We_Are">Who We Are</h3>
-<div class="text">
-
-<p>
-The Apache Tomcat Project operates on a meritocracy: the more you do,
+    <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; - Who We Are</title>
+    </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="Who_We_Are">Who We Are</h3>
+                            <div class="text">
+                                
+                                <p>
+                                    The Apache Tomcat Project operates on a 
meritocracy: the more you do,
 the more responsibility you will obtain. This page lists all of the
 people who have gone the extra mile and are Committers or members of
 the Project Management Committee (PMC). If you would like to help, please
 see the overview on <a href="getinvolved.html">getting
 involved</a>.
-</p>
-
 
-<p>
-We ask that you please do not send us emails privately asking for support. We
+                                </p>
+                                
+                                <p>
+                                    We ask that you please do not send us 
emails privately asking for support. We
 are non-paid volunteers who help out with the project and we do not
 necessarily have the time or energy to help people on an individual
 basis. Instead, we have setup <a href="./lists.html">mailing
@@ -221,265 +230,226 @@ lists</a> which contain hundreds of indi
 detailed requests for help. The benefit of using mailing lists over private
 communication is that it is a shared resource where others can also learn from
 common mistakes and as a community we all grow together.
-</p>
 
-
-<p>
+                                </p>
+                                
+                                <p>
 The following is a list of the Apache Tomcat PMC members and Committers with
 short bios for some of them.</p>
-
-
-<p>
-A complete list of all the Apache Committers is
+                                
+                                <p>
+                                    A complete list of all the Apache 
Committers is
 <a href="http://people.apache.org/committer-index.html";>also available</a>.
 (It's a long list, so please be patient.)
-</p>
-
-
-</div>
-<h3 id="PMC_Members_&amp;_Committers">PMC Members &amp; Committers</h3>
-<div class="text">
-
-
-<h4>PMC Chair</h4>
-
-<p>
-<b>Mladen Turk</b> (mturk at apache.org)<br>
-</p>
-
-
-
-<h4>PMC Members &amp; Committers</h4>
-
-
-<p>
-<b>Jean-Francois Arcand</b> (jfarcand at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Bill Barker</b> (billbarker at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Ognjen Blagojević</b> (ognjen at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Emmanuel Bourg</b> (ebourg at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Jeremy Boynes</b> (jboynes at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Jean-Frederic Clere</b> (jfclere at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Keiichi Fujino</b> (kfujino at apache.org)<br>
-</p>
-
-
-
-
-<p>
-<b>Tim Funk</b> (funkman at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Violeta Georgieva</b> (violetagg at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Henri Gomez</b> (hgomez at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Martin Grigorov</b> (mgrigorov at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Filip Hanik</b> (fhanik at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Jacob Hookom</b> (jhook at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Jim Jagielski</b> (jim at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Rainer Jung</b> (rjung at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Konstantin Kolinko</b> (kkolinko at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Olivier Lamy</b> (olamy at apache.org)<br>
-</p>
 
-
-
-<p>
-<b>Sylvain Laurent</b> (slaurent at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Remy Maucherat</b> (remm at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Costin Manolache</b> (costin at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Konstantin Prei&szlig;er</b> (kpreisser at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Peter Rossbach</b> (pero at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>William A. Rowe Jr.</b> (wrowe at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Christopher Schultz</b> (schultz at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Felix Schumacher</b> (fschumacher at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Coty Sutherland</b> (csutherl at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Eiji Takahashi</b> (eijit at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Mark Thomas</b> (markt at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Keith Wannamaker</b> (keith at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Andr&eacute; Warnier</b> (soliplaya at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Tim Whittington</b> (timw at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Huxing Zhang</b> (huxing at apache.org)<br>
-</p>
-
-
-</div>
-<h3 id="Emeritus_PMC_members">Emeritus PMC members</h3>
-<div class="text">
-
-
-<p>
-<a href="http://www.apache.org/foundation/glossary.html#Emeritus";>
-Emeritus</a> is defined in the Apache glossary.</p>
-
-
-<p>
-
-<p>
-<b>Ian Darwin</b> (idarwin at apache.org)</p>
-
-</p>
-
-
-<p>
-<b>Yoav Shapira</b> (yoavs at apache.org)</p>
-
-
-
-</div>
-<h3 id="Emeritus_Committers">Emeritus Committers</h3>
-<div class="text">
-
-
-<p>
-<a href="http://www.apache.org/foundation/glossary.html#Emeritus";>
-Emeritus</a> is defined in the Apache glossary.</p>
-
-
-<p>
-
-<b>James Duncan Davidson</b> (duncan at apache.org),
+                                </p>
+                                
+                            </div>
+                            <h3 id="PMC_Members_&amp;_Committers">PMC Members 
&amp; Committers</h3>
+                            <div class="text">
+                                
+                                <h4>PMC Chair</h4>
+                                
+                                <p>
+                                    <b>Mladen Turk</b> (mturk at apache.org)
+                                    <br>
+                                </p>
+                                
+                                <h4>PMC Members &amp; Committers</h4>
+                                
+                                <p>
+                                    <b>Jean-Francois Arcand</b> (jfarcand at 
apache.org)
+                                    <br>
+                                </p>
+                                
+                                <p>
+                                    <b>Bill Barker</b> (billbarker at 
apache.org)
+                                    <br>
+                                </p>
+                                
+                                <p>
+                                    <b>Ognjen Blagojević</b> (ognjen at 
apache.org)
+                                    <br>
+                                </p>
+                                
+                                <p>
+                                    <b>Emmanuel Bourg</b> (ebourg at 
apache.org)
+                                    <br>
+                                </p>
+                                
+                                <p>
+                                    <b>Jeremy Boynes</b> (jboynes at 
apache.org)
+                                    <br>
+                                </p>
+                                
+                                <p>
+                                    <b>Jean-Frederic Clere</b> (jfclere at 
apache.org)
+                                    <br>
+                                </p>
+                                
+                                <p>
+                                    <b>Keiichi Fujino</b> (kfujino at 
apache.org)
+                                    <br>
+                                </p>
+                                
+                                <p>
+                                    <b>Tim Funk</b> (funkman at apache.org)
+                                    <br>
+                                </p>
+                                
+                                <p>
+                                    <b>Violeta Georgieva</b> (violetagg at 
apache.org)
+                                    <br>
+                                </p>
+                                
+                                <p>
+                                    <b>Henri Gomez</b> (hgomez at apache.org)
+                                    <br>
+                                </p>
+                                
+                                <p>
+                                    <b>Martin Grigorov</b> (mgrigorov at 
apache.org)
+                                    <br>
+                                </p>
+                                
+                                <p>
+                                    <b>Filip Hanik</b> (fhanik at apache.org)
+                                    <br>
+                                </p>
+                                
+                                <p>
+                                    <b>Jacob Hookom</b> (jhook at apache.org)
+                                    <br>
+                                </p>
+                                
+                                <p>
+                                    <b>Jim Jagielski</b> (jim at apache.org)
+                                    <br>
+                                </p>
+                                
+                                <p>
+                                    <b>Rainer Jung</b> (rjung at apache.org)
+                                    <br>
+                                </p>
+                                
+                                <p>
+                                    <b>Konstantin Kolinko</b> (kkolinko at 
apache.org)
+                                    <br>
+                                </p>
+                                
+                                <p>
+                                    <b>Olivier Lamy</b> (olamy at apache.org)
+                                    <br>
+                                </p>
+                                
+                                <p>
+                                    <b>Sylvain Laurent</b> (slaurent at 
apache.org)
+                                    <br>
+                                </p>
+                                
+                                <p>
+                                    <b>Remy Maucherat</b> (remm at apache.org)
+                                    <br>
+                                </p>
+                                
+                                <p>
+                                    <b>Costin Manolache</b> (costin at 
apache.org)
+                                    <br>
+                                </p>
+                                
+                                <p>
+                                    <b>Konstantin Prei&szlig;er</b> (kpreisser 
at apache.org)
+                                    <br>
+                                </p>
+                                
+                                <p>
+                                    <b>Peter Rossbach</b> (pero at apache.org)
+                                    <br>
+                                </p>
+                                
+                                <p>
+                                    <b>William A. Rowe Jr.</b> (wrowe at 
apache.org)
+                                    <br>
+                                </p>
+                                
+                                <p>
+                                    <b>Christopher Schultz</b> (schultz at 
apache.org)
+                                    <br>
+                                </p>
+                                
+                                <p>
+                                    <b>Felix Schumacher</b> (fschumacher at 
apache.org)
+                                    <br>
+                                </p>
+                                
+                                <p>
+                                    <b>Coty Sutherland</b> (csutherl at 
apache.org)
+                                    <br>
+                                </p>
+                                
+                                <p>
+                                    <b>Eiji Takahashi</b> (eijit at apache.org)
+                                    <br>
+                                </p>
+                                
+                                <p>
+                                    <b>Mark Thomas</b> (markt at apache.org)
+                                    <br>
+                                </p>
+                                
+                                <p>
+                                    <b>Keith Wannamaker</b> (keith at 
apache.org)
+                                    <br>
+                                </p>
+                                
+                                <p>
+                                    <b>Andr&eacute; Warnier</b> (soliplaya at 
apache.org)
+                                    <br>
+                                </p>
+                                
+                                <p>
+                                    <b>Tim Whittington</b> (timw at apache.org)
+                                    <br>
+                                </p>
+                                
+                                <p>
+                                    <b>Huxing Zhang</b> (huxing at apache.org)
+                                    <br>
+                                </p>
+                                
+                            </div>
+                            <h3 id="Emeritus_PMC_members">Emeritus PMC 
members</h3>
+                            <div class="text">
+                                
+                                <p>
+                                    <a 
href="http://www.apache.org/foundation/glossary.html#Emeritus";>
+Emeritus</a> is defined in the Apache glossary.
+                                </p>
+                                
+                                <p>
+                                    
+                                    <p>
+                                        <b>Ian Darwin</b> (idarwin at 
apache.org)
+                                    </p>
+                                    
+                                </p>
+                                
+                                <p>
+                                    <b>Yoav Shapira</b> (yoavs at apache.org)
+                                </p>
+                                
+                            </div>
+                            <h3 id="Emeritus_Committers">Emeritus 
Committers</h3>
+                            <div class="text">
+                                
+                                <p>
+                                    <a 
href="http://www.apache.org/foundation/glossary.html#Emeritus";>
+Emeritus</a> is defined in the Apache glossary.
+                                </p>
+                                
+                                <p>
+                                    
+                                    <b>James Duncan Davidson</b> (duncan at 
apache.org),
 <b>Jon Scott Stevens</b> (jon at apache.org),
 <b>Sam Ruby</b> (rubys at apache.org),
 <b>Anil Vijendran</b> (akv at apache.org),
@@ -530,22 +500,24 @@ Emeritus</a> is defined in the Apache gl
 <b>Keith Eric Carmichael</b> (ecarmich at apache.org),
 <b>Guenter Knauf</b> (fuankg at apache.org),
 <b>Jean-Jacques Clar</b> (clar at apache.org),
-</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
+                                </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
     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/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1824755&r1=1824754&r2=1824755&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/index.xml (original)
+++ tomcat/site/trunk/xdocs/index.xml Mon Feb 19 14:49:58 2018
@@ -43,7 +43,7 @@ project logo are trademarks of the Apach
 <p>
 The Apache Tomcat Project is proud to announce the release of version 7.0.85 of
 Apache Tomcat. This release contains a number of bug fixes and improvements
-compared to version 7.0.84.
+compared to version 7.0.84.</p>
 
 <p>
 Full details of these changes, and all the other changes, are available in the
@@ -59,7 +59,7 @@ Full details of these changes, and all t
 <p>
 The Apache Tomcat Project is proud to announce the release of version 8.0.50
 of Apache Tomcat. Apache Tomcat 8.0.50 includes fixes for issues identified in
-8.0.49 as well as other enhancements and changes.
+8.0.49 as well as other enhancements and changes.</p>
 
 <p>
 Full details of these changes, and all the other changes, are available in the

Modified: tomcat/site/trunk/xdocs/stylesheets/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/project.xml?rev=1824755&r1=1824754&r2=1824755&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/stylesheets/project.xml (original)
+++ tomcat/site/trunk/xdocs/stylesheets/project.xml Mon Feb 19 14:49:58 2018
@@ -11,11 +11,9 @@
         <item name="Maven Plugin"             href="/maven-plugin.html"/>
     </menu>
 
-<!-- Hide menu item while we plan the next event(s)
     <menu name="TomcatCon">
-        <item name="London 2017"              href="/conference.html"/>
+        <item name="Training, Manchester"     href="/conference.html"/>
     </menu>
--->
      
     <menu name="Download">
         <item name="Which version?"           href="/whichversion.html"/>



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

Reply via email to