Modified: tomcat/site/trunk/docs/conference.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/conference.html?rev=1829368&r1=1829367&r2=1829368&view=diff
==============================================================================
--- tomcat/site/trunk/docs/conference.html (original)
+++ tomcat/site/trunk/docs/conference.html Tue Apr 17 14:04:25 2018
@@ -1,361 +1,342 @@
 <!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; - TomcatCon</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="TomcatCon_Training:_Tomcat_for_Administrators">TomcatCon Training: Tomcat 
for Administrators</h3>
-                            <div class="text">
-                                
-                                <div class="subsection">
-                                    <h4 id="When">When</h4>
-                                    <div class="text">
-                                        
-                                        <p>Tuesday, 10 April 2018</p>
-                                        
-                                    </div>
-                                </div>
-                                
-                                <div class="subsection">
-                                    <h4 id="Where">Where</h4>
-                                    <div class="text">
-                                        
-                                        <p>Hotel Novotel Manchester Centre | 
21 Dickinson Street | M1 4LX Manchester | United Kingdom</p>
-                                        
-                                    </div>
-                                </div>
-                                
-                                <div class="subsection">
-                                    <h4 id="What">What</h4>
-                                    <div class="text">
-                                        
-                                        <p>This training course is aimed at 
system administrators who are not very
+<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; - TomcatCon</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="TomcatCon_Training:_Tomcat_for_Administrators">TomcatCon Training: 
Tomcat for Administrators</h3>
+<div class="text">
+
+
+<div class="subsection">
+<h4 id="When">When</h4>
+<div class="text">
+
+
+<p>Tuesday, 10 April 2018</p>
+
+
+</div>
+</div>
+
+
+<div class="subsection">
+<h4 id="Where">Where</h4>
+<div class="text">
+
+
+<p>Hotel Novotel Manchester Centre | 21 Dickinson Street | M1 4LX Manchester | 
United Kingdom</p>
+
+
+</div>
+</div>
+
+
+<div class="subsection">
+<h4 id="What">What</h4>
+<div class="text">
+
+
+<p>This training course is aimed at system administrators who are not very
    familiar with Apache Tomcat. It will provide them with the skills necessary
    to set up a Tomcat instance, administer it on a day to day basis and to
    undertake initial troubleshooting if things go wrong.</p>
-                                        
-                                        <p>This course will be taught by Mark 
Thomas, a Tomcat committer and PMC member
+
+
+<p>This course will be taught by Mark Thomas, a Tomcat committer and PMC member
    with over 15 years experience with Apache Tomcat.</p>
-                                        
-                                        <p>
-                                            <a 
href="https://www.eventbrite.com/e/tomcatcon-training-tomcat-for-administrators-tickets-43039556472?aff=website";>Registration</a>
-   for this training course is now open.
-                                        </p>
-                                        
-                                    </div>
-                                </div>
-                                
-                                <div class="subsection">
-                                    <h4 id="Schedule">Schedule</h4>
-                                    <div class="text">
-                                        
-                                        <ul>
-                                            
-                                            <li>
-                                                09.00 Welcome
-                                                <br>
-                                                    Introductions and Welcome
-                                            </li>
-                                            
-                                            <li>
-                                                09.30 Installation
-                                                <br>
-                                                    Typical installation 
scenarios using packages from the ASF as well as
-    popular distributions.
-                                            </li>
-                                            
-                                            <li>
-                                                10.30 Web Application 
Packaging and Deployment
-                                                <br>
-                                                    The options for deploying 
applications and an in-depth look at automatic
-    deployment.
-                                            </li>
-                                            
-                                            <li>
-                                                11.30 Logging
-                                                <br>
-                                                    The default logging 
configuration and options for tailoring it for your
-    production environment.
-                                            </li>
-                                            
-                                            <li>12.30 Buffet Lunch</li>
-                                            
-                                            <li>
-                                                13.30 TLS
-                                                <br>
-                                                    An introduction to TLS and 
how it works.
-                                            </li>
-                                            
-                                            <li>
-                                                14.30 TLS configuration
-                                                <br>
-                                                    Configuring Tomcat for TLS.
-                                            </li>
-                                            
-                                            <li>
-                                                15.30 Performance and tuning
-                                                <br>
-                                                    How to identify the source 
of bottlenecks in an application and options for
-    addressing them.
-                                            </li>
-                                            
-                                            <li>
-                                                16.30 Wrap-Up
-                                                <br>
-                                                    An opportunity to ask any 
final questions
-                                            </li>
-                                            
-                                        </ul>
-                                        
-                                        <p>See you there!</p>
-                                        
-                                    </div>
-                                </div>
-                                
-                                <div class="subsection">
-                                    <h4 id="Thanks">Thanks</h4>
-                                    <div class="text">
-                                        
-                                        <p>
-                                            Thanks to <a 
href="https://pivotal.io/";>Pivotal</a> for donating the
-   trainer's time.
-                                        </p>
-                                        
-                                    </div>
-                                </div>
-                                
-                                <div class="subsection">
-                                    <h4 id="Previous_events">Previous 
events</h4>
-                                    <div class="text">
-                                        
-                                        <p>
-                                            Slides along with audio and video 
(where available) from previous events are
+
+
+<p>
+<a 
href="https://www.eventbrite.com/e/tomcatcon-training-tomcat-for-administrators-tickets-43039556472?aff=website";>Registration</a>
+   for this training course is now open.</p>
+
+
+</div>
+</div>
+
+
+<div class="subsection">
+<h4 id="Schedule">Schedule</h4>
+<div class="text">
+
+
+<ul>
+
+<li>09.00 Welcome<br>
+    Introductions and Welcome</li>
+
+<li>09.30 Installation<br>
+    Typical installation scenarios using packages from the ASF as well as
+    popular distributions.</li>
+
+<li>10.30 Web Application Packaging and Deployment<br>
+    The options for deploying applications and an in-depth look at automatic
+    deployment.</li>
+
+<li>11.30 Logging<br>
+    The default logging configuration and options for tailoring it for your
+    production environment.</li>
+
+<li>12.30 Buffet Lunch</li>
+
+<li>13.30 TLS<br>
+    An introduction to TLS and how it works.</li>
+
+<li>14.30 TLS configuration<br>
+    Configuring Tomcat for TLS.</li>
+
+<li>15.30 Performance and tuning<br>
+    How to identify the source of bottlenecks in an application and options for
+    addressing them.</li>
+
+<li>16.30 Wrap-Up<br>
+    An opportunity to ask any final questions</li>
+
+</ul>
+
+
+<p>See you there!</p>
+
+</div>
+</div>
+
+
+<div class="subsection">
+<h4 id="Thanks">Thanks</h4>
+<div class="text">
+
+
+<p>Thanks to <a href="https://pivotal.io/";>Pivotal</a> for donating the
+   trainer's time.</p>
+
+
+</div>
+</div>
+
+
+<div class="subsection">
+<h4 id="Previous_events">Previous events</h4>
+<div class="text">
+
+
+<p>Slides along with audio and video (where available) from previous events are
    available from the <a href="presentations.html">previous presentations</a>
-   page.
-                                        </p>
-                                        
-                                    </div>
-                                </div>
-                                
-                            </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
+   page.</p>
+
+
+</div>
+</div>
+
+
+</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/contact.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/contact.html?rev=1829368&r1=1829367&r2=1829368&view=diff
==============================================================================
--- tomcat/site/trunk/docs/contact.html (original)
+++ tomcat/site/trunk/docs/contact.html Tue Apr 17 14:04:25 2018
@@ -1,279 +1,267 @@
 <!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; - Contact Information</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="Product_Support">Product Support</h3>
-                            <div class="text">
-                                
-                                <p>
-                                    If you have questions or comments about 
the software or documentation on this site, 
+<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; - Contact Information</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="Product_Support">Product Support</h3>
+<div class="text">
+
+<p>
+If you have questions or comments about the software or documentation on this 
site, 
 please subscribe to the appropriate <a href="lists.html">mailing list</a>.
+</p>
+
+</div>
+<h3 id="Security_Issues">Security Issues</h3>
+<div class="text">
 
-                                </p>
-                                
-                            </div>
-                            <h3 id="Security_Issues">Security Issues</h3>
-                            <div class="text">
-                                
-                                <p>
-                                    If you would like to report a security 
issue with Apache Tomcat,
+<p>
+If you would like to report a security issue with Apache Tomcat,
 please contact <a 
href="mailto:secur...@tomcat.apache.org";>secur...@tomcat.apache.org</a>.
 <strong>Only</strong> security issues should be sent to this address.
+</p>
+
+</div>
+<h3 id="General_Apache_Issues">General Apache Issues</h3>
+<div class="text">
 
-                                </p>
-                                
-                            </div>
-                            <h3 id="General_Apache_Issues">General Apache 
Issues</h3>
-                            <div class="text">
-                                
-                                <p>
-                                    The Tomcat Project is an effort of the 
+<p>
+The Tomcat Project is an effort of the 
 <a href="http://apache.org/foundation/";>Apache Software Foundation</a>. The 
 address for general ASF correspondence and licensing questions is:
+</p>
+
+
+<p>
 
-                                </p>
-                                
-                                <p>
-                                    
-                                    <a 
href="mailto:apache.AT.apache.DOT.org";>apache.AT.apache.DOT.org</a>
-
-                                </p>
-                                
-                                <p>
-                                    You can find more contact information for 
the Apache Software Foundation 
+<a href="mailto:apache.AT.apache.DOT.org";>apache.AT.apache.DOT.org</a>
+
+</p>
+
+
+<p>
+You can find more contact information for the Apache Software Foundation 
 on the <a href="http://www.apache.org/foundation/contact.html";>contact 
 page of the main Apache site</a>.
+</p>
 
-                                </p>
-                                
-                                <p>
-                                    You may also use 
+
+<p>
+You may also use 
 <a href="http://search.apache.org/";>Apache Site Search</a> to scan all the 
 Apache sites at once. 
+</p>
+
 
-                                </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/download-70.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=1829368&r1=1829367&r2=1829368&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-70.html (original)
+++ tomcat/site/trunk/docs/download-70.html Tue Apr 17 14:04:25 2018
@@ -47,14 +47,6 @@
 </ul>
 </div>
 <div>
-<h2>TomcatCon</h2>
-<ul>
-<li>
-<a href="./conference.html">Training, Manchester</a>
-</li>
-</ul>
-</div>
-<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/download-80.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-80.html?rev=1829368&r1=1829367&r2=1829368&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-80.html (original)
+++ tomcat/site/trunk/docs/download-80.html Tue Apr 17 14:04:25 2018
@@ -47,14 +47,6 @@
 </ul>
 </div>
 <div>
-<h2>TomcatCon</h2>
-<ul>
-<li>
-<a href="./conference.html">Training, Manchester</a>
-</li>
-</ul>
-</div>
-<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/download-90.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-90.html?rev=1829368&r1=1829367&r2=1829368&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-90.html (original)
+++ tomcat/site/trunk/docs/download-90.html Tue Apr 17 14:04:25 2018
@@ -47,14 +47,6 @@
 </ul>
 </div>
 <div>
-<h2>TomcatCon</h2>
-<ul>
-<li>
-<a href="./conference.html">Training, Manchester</a>
-</li>
-</ul>
-</div>
-<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/download-connectors.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-connectors.html?rev=1829368&r1=1829367&r2=1829368&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-connectors.html (original)
+++ tomcat/site/trunk/docs/download-connectors.html Tue Apr 17 14:04:25 2018
@@ -47,14 +47,6 @@
 </ul>
 </div>
 <div>
-<h2>TomcatCon</h2>
-<ul>
-<li>
-<a href="./conference.html">Training, Manchester</a>
-</li>
-</ul>
-</div>
-<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/download-native.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1829368&r1=1829367&r2=1829368&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-native.html (original)
+++ tomcat/site/trunk/docs/download-native.html Tue Apr 17 14:04:25 2018
@@ -47,14 +47,6 @@
 </ul>
 </div>
 <div>
-<h2>TomcatCon</h2>
-<ul>
-<li>
-<a href="./conference.html">Training, Manchester</a>
-</li>
-</ul>
-</div>
-<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/download-taglibs.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-taglibs.html?rev=1829368&r1=1829367&r2=1829368&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-taglibs.html (original)
+++ tomcat/site/trunk/docs/download-taglibs.html Tue Apr 17 14:04:25 2018
@@ -47,14 +47,6 @@
 </ul>
 </div>
 <div>
-<h2>TomcatCon</h2>
-<ul>
-<li>
-<a href="./conference.html">Training, Manchester</a>
-</li>
-</ul>
-</div>
-<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/findhelp.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/findhelp.html?rev=1829368&r1=1829367&r2=1829368&view=diff
==============================================================================
--- tomcat/site/trunk/docs/findhelp.html (original)
+++ tomcat/site/trunk/docs/findhelp.html Tue Apr 17 14:04:25 2018
@@ -1,301 +1,287 @@
 <!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; - Find Help</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="Find_help">Find help</h3>
-                            <div class="text">
-                                
-                                <p>Apache Tomcat support is provided by the 
community, for the community, on a
+<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; - Find Help</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="Find_help">Find help</h3>
+<div class="text">
+
+
+<p>Apache Tomcat support is provided by the community, for the community, on a
 purely volunteer basis. This page has been written to help you find the help 
you
 need whilst making the most efficient use of the resources available. The types
 of help are presented in the same order they are typically used.</p>
-                                
-                                <p>
-                                    The first resource to check is the 
documentation. In addition to the Tomcat
+
+
+<p>The first resource to check is the documentation. In addition to the Tomcat
 documentation (make sure you check the documentation for the version you are
 using) you should also check the relevant Servlet and/or JSP
 <a href="https://wiki.apache.org/tomcat/Specifications";>Specification</a> 
documents.
 Much of Tomcat's behaviour is determined by these specifications and the 
information in
-them is not typically duplicated in the Tomcat documentation.
-                                </p>
-                                
-                                <p>The documentation is searchable &ndash; see 
input box at the top of the
+them is not typically duplicated in the Tomcat documentation.</p>
+
+
+<p>The documentation is searchable &ndash; see input box at the top of the
 page. To limit results to a specific major version of Apache Tomcat you can
 add the number to the search string, wrapping it in quotes, e.g. "7.0".</p>
-                                
-                                <p>The logs which Apache Tomcat generates can 
be a valuable resource when trying
+
+
+<p>The logs which Apache Tomcat generates can be a valuable resource when 
trying
 to diagnose a problem. Please review them. You may want to enable debug output
 in your Apache Tomcat configuration so that you have more information to help
 diagnose the problem.</p>
-                                
-                                <p>It is unusual to find a problem that has 
never been reported.  The chances are
+
+
+<p>It is unusual to find a problem that has never been reported.  The chances 
are
 that your question has been asked and answered by somebody else. Use your
 favourite search engine to try and find it.</p>
-                                
-                                <p>
-                                    Answers to very common questions are 
documented on the
-<a href="https://wiki.apache.org/tomcat/FAQ";>FAQ</a>.
-                                </p>
-                                
-                                <p>
-                                    The archives for the user mailing list are 
a rich source of useful
+
+
+<p>Answers to very common questions are documented on the
+<a href="https://wiki.apache.org/tomcat/FAQ";>FAQ</a>.</p>
+
+
+<p>The archives for the user mailing list are a rich source of useful
 information. Use the search features provided by one of them. A
 <a href="lists.html">selection of archives</a> is provided on the mailing list
-page.
-                                </p>
-                                
-                                <p>
-                                    If you have already subscribed to the 
relevant mailing list,
+page.</p>
+
+
+<p>If you have already subscribed to the relevant mailing list,
 you can ask about the problem on there.  If you are not subscribed, you
 will need to subscribe before you can send your question to either of these
 lists. The <a href="lists.html">mailing list</a> pages provide further
 information on how to use the mailing lists as well as subscription
-instructions.
-                                </p>
-                                
-                                <p>
-                                    If you have found a bug or propose an 
enhancement, follow the documented
+instructions.</p>
+
+
+<p>If you have found a bug or propose an enhancement, follow the documented
 <a href="bugreport.html">bug reporting</a> steps. Please note, that Bugzilla
 is not a support forum. If you need help with your problem, use the users
-<a href="lists.html">mailing list</a>.
-                                </p>
-                                
-                                <p>
-                                    There is also an <a href="irc.html">IRC 
channel</a> dedicated to Tomcat.
-                                </p>
-                                
-                                <p>
-                                    A number of <a 
href="presentations.html">Tomcat presentations</a> are
-available from past Apache conferences and other sources.
-                                </p>
-                                
-                                <p>
-                                    A list of organisations that provide 
support and training for Apache Tomcat
+<a href="lists.html">mailing list</a>.</p>
+
+
+<p>There is also an <a href="irc.html">IRC channel</a> dedicated to Tomcat.</p>
+
+
+<p>A number of <a href="presentations.html">Tomcat presentations</a> are
+available from past Apache conferences and other sources.</p>
+
+
+<p>A list of organisations that provide support and training for Apache Tomcat
 is maintained on the
-<a href="https://wiki.apache.org/tomcat/SupportAndTraining";>Tomcat Wiki</a>.
-                                </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
+<a href="https://wiki.apache.org/tomcat/SupportAndTraining";>Tomcat 
Wiki</a>.</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>



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

Reply via email to