Modified: tomcat/site/trunk/docs/conference.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/conference.html?rev=1842760&r1=1842759&r2=1842760&view=diff
==============================================================================
--- tomcat/site/trunk/docs/conference.html (original)
+++ tomcat/site/trunk/docs/conference.html Wed Oct  3 20:10:15 2018
@@ -1,324 +1,321 @@
 <!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>
-                            <div class="asfevents">
-                                <a 
href="https://www.apache.org/events/current-event.html";><img 
src="https://www.apache.org/events/current-event-234x60.png";></a>
-                            </div>
-                            <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">North 
America</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="https://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>Swag</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>
-                                        <li>
-                                            <a 
href="http://www.apache.org/licenses/";>License</a>
-                                        </li>
-                                    </ul>
-                                </div>
-                            </nav>
-                        </div>
-                    </div>
-                    <div id="mainRight">
-                        <div id="content">
-                            <h2 style="display: none;">Content</h2>
-                            <h3 id="TomcatCon">TomcatCon</h3>
-                            <div class="text">
-                                
-                                <p>TomcatCon is the place for all users of 
Tomcat to expand their Tomcat
+<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>
+<div class="asfevents">
+<a href="https://www.apache.org/events/current-event.html";><img 
src="https://www.apache.org/events/current-event-234x60.png";></a>
+</div>
+<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="https://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>Swag</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>
+<li>
+<a href="http://www.apache.org/licenses/";>License</a>
+</li>
+</ul>
+</div>
+</nav>
+</div>
+</div>
+<div id="mainRight">
+<div id="content">
+<h2 style="display: none;">Content</h2>
+<h3 id="TomcatCon">TomcatCon</h3>
+<div class="text">
+
+
+<p>TomcatCon is the place for all users of Tomcat to expand their Tomcat
    knowledge in areas such as networking, security, performance and deployment.
    It also offers an opportunity to discuss the current Tomcat roadmap and
    help inform future development.</p>
-                                
-                            </div>
-                            <h3 id="TomcatCon_Montr&eacute;al">TomcatCon 
Montr&eacute;al</h3>
-                            <div class="text">
-                                
-                                <div class="subsection">
-                                    <h4 id="When">When</h4>
-                                    <div class="text">
-                                        
-                                        <p>September 24 to 25, 2018.</p>
-                                        
-                                        <p>
-                                            <i>Note: The main conference is 
September 25 to 27, 2018. The Tomcat track
+
+
+</div>
+<h3 id="TomcatCon_Montr&eacute;al">TomcatCon Montr&eacute;al</h3>
+<div class="text">
+
+
+<div class="subsection">
+<h4 id="When">When</h4>
+<div class="text">
+
+
+<p>September 24 to 25, 2018.</p>
+
+
+<p>
+<i>Note: The main conference is September 25 to 27, 2018. The Tomcat track
    starts the day before.</i>
-                                        </p>
-                                         
+</p> 
+
+
+</div>
+</div>
 
 
-                                    </div>
-                                </div>
-                                
-                                <div class="subsection">
-                                    <h4 id="Where">Where</h4>
-                                    <div class="text">
-                                        
-                                        <p>
-                                            <a 
href="https://www.apachecon.com/acna18/venue.html";>Montr&eacute;al Marriott
+<div class="subsection">
+<h4 id="Where">Where</h4>
+<div class="text">
+
+
+<p>
+<a href="https://www.apachecon.com/acna18/venue.html";>Montr&eacute;al Marriott
       Chateau Champlain</a>, Montr&eacute;al, Canada, as part of
       <a href="http://www.apachecon.com/acna18/";>ApacheCon North
-      America 2018</a>.
-                                        </p>
-                                         
+      America 2018</a>.</p> 
+
 
+</div>
+</div>
 
-                                    </div>
-                                </div>
-                                
-                                <div class="subsection">
-                                    <h4 id="What">What</h4>
-                                    <div class="text">
-                                        
-                                        <p>This is a two day track dedicated 
to Apache Tomcat that starts the day before
+
+<div class="subsection">
+<h4 id="What">What</h4>
+<div class="text">
+
+
+<p>This is a two day track dedicated to Apache Tomcat that starts the day 
before
    the main conference.</p>
-                                        
-                                        <p>
-                                            <a 
href="https://www.eventbrite.com/e/apachecon-north-america-2018-registration-43200327342";>Registration</a>
+
+
+<p>
+<a 
href="https://www.eventbrite.com/e/apachecon-north-america-2018-registration-43200327342";>Registration</a>
    for TomcatCon is open. Registration includes access to ApacheCon North
-   America.
-                                        </p>
-                                        
-                                    </div>
-                                </div>
-                                
-                                <div class="subsection">
-                                    <h4 id="Schedule">Schedule</h4>
-                                    <div class="text">
-                                        
-                                        <p>
-                                            The full
+   America.</p>
+
+
+</div>
+</div>
+
+
+<div class="subsection">
+<h4 id="Schedule">Schedule</h4>
+<div class="text">
+
+
+<p>The full
    <a 
href="http://apachecon.dukecon.org/acna/2018/#/schedule/2018-09-24";>schedule</a>
-   is now available. There are two days of great content covering:
-                                        </p>
-                                           
-                                        <ul>
-                                                 
-                                            <li>roadmap</li>
-                                                 
-                                            <li>security</li>
-                                                 
-                                            <li>networking (reverse proxying, 
load-balancing, clustering)</li>
-                                                 
-                                            <li>performance and monitoring</li>
-                                               
-                                        </ul>
-                                        
-                                        <p>See you there!</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
+   is now available. There are two days of great content covering:</p>
+   
+<ul>
+     
+<li>roadmap</li>
+     
+<li>security</li>
+     
+<li>networking (reverse proxying, load-balancing, clustering)</li>
+     
+<li>performance and monitoring</li>
+   
+</ul>
+
+<p>See you there!</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=1842760&r1=1842759&r2=1842760&view=diff
==============================================================================
--- tomcat/site/trunk/docs/contact.html (original)
+++ tomcat/site/trunk/docs/contact.html Wed Oct  3 20:10:15 2018
@@ -1,288 +1,276 @@
 <!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>
-                            <div class="asfevents">
-                                <a 
href="https://www.apache.org/events/current-event.html";><img 
src="https://www.apache.org/events/current-event-234x60.png";></a>
-                            </div>
-                            <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">North 
America</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="https://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>Swag</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>
-                                        <li>
-                                            <a 
href="http://www.apache.org/licenses/";>License</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>
+<div class="asfevents">
+<a href="https://www.apache.org/events/current-event.html";><img 
src="https://www.apache.org/events/current-event-234x60.png";></a>
+</div>
+<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="https://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>Swag</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>
+<li>
+<a href="http://www.apache.org/licenses/";>License</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=1842760&r1=1842759&r2=1842760&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-70.html (original)
+++ tomcat/site/trunk/docs/download-70.html Wed Oct  3 20:10:15 2018
@@ -1,247 +1,236 @@
 <!DOCTYPE html SYSTEM "about:legacy-compat">
 <html lang="en">
-    <head>
-        <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <link href="res/css/tomcat.css" rel="stylesheet" type="text/css">
-        <link href="res/css/fonts/fonts.css" rel="stylesheet" type="text/css">
-        <title>Apache Tomcat&reg; - Apache Tomcat 7 Software Downloads</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>
-                            <div class="asfevents">
-                                <a 
href="https://www.apache.org/events/current-event.html";><img 
src="https://www.apache.org/events/current-event-234x60.png";></a>
-                            </div>
-                            <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">North 
America</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="https://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>Swag</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>
-                                        <li>
-                                            <a 
href="http://www.apache.org/licenses/";>License</a>
-                                        </li>
-                                    </ul>
-                                </div>
-                            </nav>
-                        </div>
-                    </div>
-                    <div id="mainRight">
-                        <div id="content">
-                            <h2 style="display: none;">Content</h2>
-                            <h3 id="Tomcat_7_Software_Downloads">Tomcat 7 
Software Downloads</h3>
-                            <div class="text">
-                                    
-                                <p>
-                                    Welcome to the Apache 
Tomcat<sup>&reg;</sup> 7.x software download page. This page
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<link href="res/css/tomcat.css" rel="stylesheet" type="text/css">
+<link href="res/css/fonts/fonts.css" rel="stylesheet" type="text/css">
+<title>Apache Tomcat&reg; - Apache Tomcat 7 Software Downloads</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>
+<div class="asfevents">
+<a href="https://www.apache.org/events/current-event.html";><img 
src="https://www.apache.org/events/current-event-234x60.png";></a>
+</div>
+<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="https://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>Swag</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>
+<li>
+<a href="http://www.apache.org/licenses/";>License</a>
+</li>
+</ul>
+</div>
+</nav>
+</div>
+</div>
+<div id="mainRight">
+<div id="content">
+<h2 style="display: none;">Content</h2>
+<h3 id="Tomcat_7_Software_Downloads">Tomcat 7 Software Downloads</h3>
+<div class="text">
+    
+<p>Welcome to the Apache Tomcat<sup>&reg;</sup> 7.x software download page. 
This page
     provides download links for obtaining the latest version of Tomcat 7.0.x
     software, as well as links to the archives of older releases.
-    
-                                </p>
-                                  
-                            </div>
-                            <h3 id="Quick_Navigation">Quick Navigation</h3>
-                            <div class="text">
-                                [define v]7.0.91[end]
+    </p>
+  
+</div>
+<h3 id="Quick_Navigation">Quick Navigation</h3>
+<div class="text">
+
+[define v]7.0.91[end]
         <a href="https://www.apache.org/dist/tomcat/tomcat-7/KEYS";>KEYS</a> |
         <a href="#[v]">[v]</a> |
         <a href="[preferred]tomcat/tomcat-7/v[v]" rel="nofollow">Browse</a> |
         <a href="https://archive.apache.org/dist/tomcat/tomcat-7";>Archives</a>
       
-                            </div>
-                            <h3 id="Release_Integrity">Release Integrity</h3>
-                            <div class="text">
-                                    
-                                <p>
-                                    You <strong>must</strong>
+</div>
+<h3 id="Release_Integrity">Release Integrity</h3>
+<div class="text">
+    
+<p>You <strong>must</strong>
     <a href="https://www.apache.org/info/verification.html";>verify</a> the
     integrity of the downloaded files. We provide OpenPGP signatures for every
     release file.  This signature should be matched against the
@@ -250,26 +239,21 @@
     provide <code>SHA-512</code> checksums for every release file. After you
     download the file, you should calculate a checksum for your download, and
     make sure it is the same as ours.
+    </p>
+  
+</div>
+<h3 id="Mirrors">Mirrors</h3>
+<div class="text">
+       
     
-                                </p>
-                                  
-                            </div>
-                            <h3 id="Mirrors">Mirrors</h3>
-                            <div class="text">
-                                       
-    
-                                <p>
-                                    You are currently using 
<b>[preferred]</b>.  If you
+<p>You are currently using <b>[preferred]</b>.  If you
        encounter a problem with this mirror, please select another
        mirror.  If all mirrors are failing, there are <i>backup</i>
        mirrors (at the end of the mirrors list) that should be
-       available.
-                                    <br>
-                                    [if-any logo]<a href="[link]" 
rel="nofollow"><img alt="Logo" src="[logo]"></a>[end]
-                                </p>
-                                <form action="[location]" method="get" 
id="SelectMirror">
-                                    <p>
-                                               Other mirrors: <select 
name="Preferred">
+       available.<br>[if-any logo]<a href="[link]" rel="nofollow"><img 
alt="Logo" src="[logo]"></a>[end]</p>
+<form action="[location]" method="get" id="SelectMirror">
+<p>
+       Other mirrors: <select name="Preferred">
          [if-any http]
            [for http]<option value="[http]">[http]</option>[end]
          [end]
@@ -280,221 +264,209 @@
            [for backup]<option value="[backup]">[backup] (backup)</option>[end]
            [end]
          </select><input type="submit" value="Change">
-                                    </p>
-                                </form>
-                                      
+</p>
+</form>
+      
    
   
-                            </div>
-                            <h3 id="[v]">[v]</h3>
-                            <div class="text">
-                                      
-                                <p>
-                                          Please see the 
+</div>
+<h3 id="[v]">[v]</h3>
+<div class="text">
+      
+<p>
+      Please see the 
       <a href="[preferred]tomcat/tomcat-7/v[v]/README.html" 
rel="nofollow">README</a>
       file for packaging information.  It explains what every distribution 
contains.
+      </p>
+
       
-                                </p>
-                                      
-                                <div class="subsection">
-                                    <h4 id="Binary_Distributions">Binary 
Distributions</h4>
-                                    <div class="text">
-                                              
-                                        <ul>
-                                                    
-                                            <li>
-                                                Core:
-          
-                                                <ul>
-                                                              
-                                                    <li>
-                                                                    <a 
href="[preferred]tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].zip" 
rel="nofollow">zip</a> 
+<div class="subsection">
+<h4 id="Binary_Distributions">Binary Distributions</h4>
+<div class="text">
+      
+<ul>
+        
+<li>Core:
+          <ul>
+          
+<li>
+            
+<a href="[preferred]tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].zip" 
rel="nofollow">zip</a> 
             (<a 
href="https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].zip.asc";>pgp</a>,
 
             <a 
href="https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].zip.sha512";>sha512</a>)
+          </li>
           
-                                                    </li>
-                                                              
-                                                    <li>
-                                                                    <a 
href="[preferred]tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].tar.gz" 
rel="nofollow">tar.gz</a> 
+<li>
+            
+<a href="[preferred]tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].tar.gz" 
rel="nofollow">tar.gz</a> 
             (<a 
href="https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].tar.gz.asc";>pgp</a>,
 
             <a 
href="https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].tar.gz.sha512";>sha512</a>)
+          </li>
           
-                                                    </li>
-                                                              
-                                                    <li>
-                                                                    <a 
href="[preferred]tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-windows-x86.zip" 
rel="nofollow">32-bit Windows zip</a> 
+<li>
+            
+<a 
href="[preferred]tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-windows-x86.zip" 
rel="nofollow">32-bit Windows zip</a> 
             (<a 
href="https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-windows-x86.zip.asc";>pgp</a>,
 
             <a 
href="https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-windows-x86.zip.sha512";>sha512</a>)
+          </li>
           
-                                                    </li>
-                                                              
-                                                    <li>
-                                                                    <a 
href="[preferred]tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-windows-x64.zip" 
rel="nofollow">64-bit Windows zip</a> 
+<li>
+            
+<a 
href="[preferred]tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-windows-x64.zip" 
rel="nofollow">64-bit Windows zip</a> 
             (<a 
href="https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-windows-x64.zip.asc";>pgp</a>,
 
             <a 
href="https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-windows-x64.zip.sha512";>sha512</a>)
+          </li>
           
-                                                    </li>
-                                                              
-                                                    <li>
-                                                                    <a 
href="[preferred]tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].exe" 
rel="nofollow">32-bit/64-bit Windows Service Installer</a> 
+<li>
+            
+<a href="[preferred]tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].exe" 
rel="nofollow">32-bit/64-bit Windows Service Installer</a> 
             (<a 
href="https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].exe.asc";>pgp</a>,
 
             <a 
href="https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].exe.sha512";>sha512</a>)
+          </li>
+          
+</ul>
+        
+</li>
+        
+<li>Full documentation:
+          <ul>
           
-                                                    </li>
-                                                              
-                                                </ul>
-                                                        
-                                            </li>
-                                                    
-                                            <li>
-                                                Full documentation:
-          
-                                                <ul>
-                                                              
-                                                    <li>
-                                                                    <a 
href="[preferred]tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-fulldocs.tar.gz" 
rel="nofollow">tar.gz</a> 
+<li>
+            
+<a 
href="[preferred]tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-fulldocs.tar.gz" 
rel="nofollow">tar.gz</a> 
             (<a 
href="https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-fulldocs.tar.gz.asc";>pgp</a>,
 
             <a 
href="https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-fulldocs.tar.gz.sha512";>sha512</a>)
+          </li>
           
-                                                    </li>
-                                                              
-                                                </ul>
-                                                        
-                                            </li>
-                                                    
-                                            <li>
-                                                Deployer:
-          
-                                                <ul>
-                                                              
-                                                    <li>
-                                                                    <a 
href="[preferred]tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-deployer.zip" 
rel="nofollow">zip</a> 
+</ul>
+        
+</li>
+        
+<li>Deployer:
+          <ul>
+          
+<li>
+            
+<a href="[preferred]tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-deployer.zip" 
rel="nofollow">zip</a> 
             (<a 
href="https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-deployer.zip.asc";>pgp</a>,
  
             <a 
href="https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-deployer.zip.sha512";>sha512</a>)
+          </li>
           
-                                                    </li>
-                                                              
-                                                    <li>
-                                                                    <a 
href="[preferred]tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-deployer.tar.gz" 
rel="nofollow">tar.gz</a> 
+<li>
+            
+<a 
href="[preferred]tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-deployer.tar.gz" 
rel="nofollow">tar.gz</a> 
             (<a 
href="https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-deployer.tar.gz.asc";>pgp</a>,
 
             <a 
href="https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-deployer.tar.gz.sha512";>sha512</a>)
+          </li>
           
-                                                    </li>
-                                                              
-                                                </ul>
-                                                        
-                                            </li>
-                                                    
-                                            <li>
-                                                Extras:
-          
-                                                <ul>
-                                                              
-                                                    <li>
-                                                                    <a 
href="[preferred]tomcat/tomcat-7/v[v]/bin/extras/catalina-jmx-remote.jar" 
rel="nofollow">JMX Remote jar</a> 
+</ul>
+        
+</li>
+        
+<li>Extras:
+          <ul>
+          
+<li>
+            
+<a href="[preferred]tomcat/tomcat-7/v[v]/bin/extras/catalina-jmx-remote.jar" 
rel="nofollow">JMX Remote jar</a> 
             (<a 
href="https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/extras/catalina-jmx-remote.jar.asc";>pgp</a>,
 
             <a 
href="https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/extras/catalina-jmx-remote.jar.sha512";>sha512</a>)
+          </li>
           
-                                                    </li>
-                                                              
-                                                    <li>
-                                                                    <a 
href="[preferred]tomcat/tomcat-7/v[v]/bin/extras/catalina-ws.jar" 
rel="nofollow">Web services jar</a> 
+<li>
+            
+<a href="[preferred]tomcat/tomcat-7/v[v]/bin/extras/catalina-ws.jar" 
rel="nofollow">Web services jar</a> 
             (<a 
href="https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/extras/catalina-ws.jar.asc";>pgp</a>,
 
             <a 
href="https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/extras/catalina-ws.jar.sha512";>sha512</a>)
+          </li>
           
-                                                    </li>
-                                                              
-                                                    <li>
-                                                                    <a 
href="[preferred]tomcat/tomcat-7/v[v]/bin/extras/tomcat-juli-adapters.jar" 
rel="nofollow">JULI adapters jar</a> 
+<li>
+            
+<a href="[preferred]tomcat/tomcat-7/v[v]/bin/extras/tomcat-juli-adapters.jar" 
rel="nofollow">JULI adapters jar</a> 
             (<a 
href="https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/extras/tomcat-juli-adapters.jar.asc";>pgp</a>,
 
             <a 
href="https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/extras/tomcat-juli-adapters.jar.sha512";>sha512</a>)
+          </li>
           
-                                                    </li>
-                                                              
-                                                    <li>
-                                                                    <a 
href="[preferred]tomcat/tomcat-7/v[v]/bin/extras/tomcat-juli.jar" 
rel="nofollow">JULI log4j jar</a> 
+<li>
+            
+<a href="[preferred]tomcat/tomcat-7/v[v]/bin/extras/tomcat-juli.jar" 
rel="nofollow">JULI log4j jar</a> 
             (<a 
href="https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/extras/tomcat-juli.jar.asc";>pgp</a>,
 
             <a 
href="https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/extras/tomcat-juli.jar.sha512";>sha512</a>)
+          </li>
+          
+</ul>
+        
+</li>
+        
+<li>Embedded:
+          <ul>
           
-                                                    </li>
-                                                              
-                                                </ul>
-                                                        
-                                            </li>
-                                                    
-                                            <li>
-                                                Embedded:
-          
-                                                <ul>
-                                                              
-                                                    <li>
-                                                                    <a 
href="[preferred]tomcat/tomcat-7/v[v]/bin/embed/apache-tomcat-[v]-embed.tar.gz" 
rel="nofollow">tar.gz</a> 
+<li>
+            
+<a 
href="[preferred]tomcat/tomcat-7/v[v]/bin/embed/apache-tomcat-[v]-embed.tar.gz" 
rel="nofollow">tar.gz</a> 
             (<a 
href="https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/embed/apache-tomcat-[v]-embed.tar.gz.asc";>pgp</a>,
 
             <a 
href="https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/embed/apache-tomcat-[v]-embed.tar.gz.sha512";>sha512</a>)
+          </li>
           
-                                                    </li>
-                                                              
-                                                    <li>
-                                                                    <a 
href="[preferred]tomcat/tomcat-7/v[v]/bin/embed/apache-tomcat-[v]-embed.zip" 
rel="nofollow">zip</a> 
+<li>
+            
+<a 
href="[preferred]tomcat/tomcat-7/v[v]/bin/embed/apache-tomcat-[v]-embed.zip" 
rel="nofollow">zip</a> 
             (<a 
href="https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/embed/apache-tomcat-[v]-embed.zip.asc";>pgp</a>,
 
             <a 
href="https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/embed/apache-tomcat-[v]-embed.zip.sha512";>sha512</a>)
+          </li>
           
-                                                    </li>
-                                                              
-                                                </ul>
-                                                        
-                                            </li>
-                                                  
-                                        </ul>
-                                              
-                                    </div>
-                                </div>
-                                      
+</ul>
+        
+</li>
+      
+</ul>
+      
+</div>
+</div>
+      
  
       
       
-                                <div class="subsection">
-                                    <h4 id="Source_Code_Distributions">Source 
Code Distributions</h4>
-                                    <div class="text">
-                                              
-                                        <ul>
-                                                    
-                                            <li>
-                                                          <a 
href="[preferred]tomcat/tomcat-7/v[v]/src/apache-tomcat-[v]-src.tar.gz" 
rel="nofollow">tar.gz</a> 
+<div class="subsection">
+<h4 id="Source_Code_Distributions">Source Code Distributions</h4>
+<div class="text">
+      
+<ul>
+        
+<li>
+          
+<a href="[preferred]tomcat/tomcat-7/v[v]/src/apache-tomcat-[v]-src.tar.gz" 
rel="nofollow">tar.gz</a> 
           (<a 
href="https://www.apache.org/dist/tomcat/tomcat-7/v[v]/src/apache-tomcat-[v]-src.tar.gz.asc";>pgp</a>,
 
           <a 
href="https://www.apache.org/dist/tomcat/tomcat-7/v[v]/src/apache-tomcat-[v]-src.tar.gz.sha512";>sha512</a>)
+        </li>
         
-                                            </li>
-                                                    
-                                            <li>
-                                                          <a 
href="[preferred]tomcat/tomcat-7/v[v]/src/apache-tomcat-[v]-src.zip" 
rel="nofollow">zip</a> 
+<li>
+          
+<a href="[preferred]tomcat/tomcat-7/v[v]/src/apache-tomcat-[v]-src.zip" 
rel="nofollow">zip</a> 
           (<a 
href="https://www.apache.org/dist/tomcat/tomcat-7/v[v]/src/apache-tomcat-[v]-src.zip.asc";>pgp</a>,
 
           <a 
href="https://www.apache.org/dist/tomcat/tomcat-7/v[v]/src/apache-tomcat-[v]-src.zip.sha512";>sha512</a>)
-        
-                                            </li>
-                                                  
-                                        </ul>
-                                              
-                                    </div>
-                                </div>
-                                      
+        </li>
+      
+</ul>
+      
+</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
+</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