Modified: tomcat/site/trunk/docs/migration-9.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-9.html?rev=1873527&r1=1873526&r2=1873527&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-9.html (original)
+++ tomcat/site/trunk/docs/migration-9.html Mon Feb  3 09:51:13 2020
@@ -1,509 +1,493 @@
 <!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; - Migration Guide - Tomcat 9.0.x</title>
-<meta name="author" content="Apache Tomcat Project">
-</head>
-<body>
-<div id="wrapper">
-<header id="header">
-<div class="clearfix">
-<div class="menu-toggler pull-left" tabindex="1">
-<div class="hamburger"></div>
-</div>
-<a href="http://tomcat.apache.org/";><img class="tomcat-logo pull-left noPrint" 
alt="Tomcat Home" src="res/images/tomcat.png"></a>
-<h1 class="pull-left">Apache Tomcat<sup>&reg;</sup>
-</h1>
-<div class="asf-logos pull-right">
-<a href="https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left"><img 
src="https://www.apache.org/images/SupportApache-small.png"; class="support-asf" 
alt="Support Apache"></a><a href="http://www.apache.org/"; target="_blank" 
class="pull-left"><img src="res/images/asf_logo.svg" class="asf-logo" alt="The 
Apache Software Foundation"></a>
-</div>
-</div>
-</header>
-<main id="middle">
-<div>
-<div id="mainLeft">
-<div id="nav-wrapper">
-<form action="https://www.google.com/search"; method="get">
-<div class="searchbox">
-<input value="tomcat.apache.org" name="sitesearch" type="hidden"><input 
aria-label="Search text" 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"; alt="Next ASF 
event"><br>
-              Save the date!
+    <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; - Migration Guide - Tomcat 9.0.x</title>
+        <meta name="author" content="Apache Tomcat Project">
+    </head>
+    <body>
+        <div id="wrapper">
+            <header id="header">
+                <div class="clearfix">
+                    <div class="menu-toggler pull-left" tabindex="1">
+                        <div class="hamburger"></div>
+                    </div>
+                    <a href="http://tomcat.apache.org/";><img 
class="tomcat-logo pull-left noPrint" alt="Tomcat Home" 
src="res/images/tomcat.png"></a>
+                    <h1 class="pull-left">
+                        Apache Tomcat<sup>&reg;</sup>
+                    </h1>
+                    <div class="asf-logos pull-right">
+                        <a 
href="https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left"><img 
src="https://www.apache.org/images/SupportApache-small.png"; class="support-asf" 
alt="Support Apache"></a><a href="http://www.apache.org/"; target="_blank" 
class="pull-left"><img src="res/images/asf_logo.svg" class="asf-logo" alt="The 
Apache Software Foundation"></a>
+                    </div>
+                </div>
+            </header>
+            <main id="middle">
+                <div>
+                    <div id="mainLeft">
+                        <div id="nav-wrapper">
+                            <form action="https://www.google.com/search"; 
method="get">
+                                <div class="searchbox">
+                                    <input value="tomcat.apache.org" 
name="sitesearch" type="hidden"><input aria-label="Search text" 
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"; alt="Next ASF 
event">
+                                    <br>
+                                                  Save the date!
             </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-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://cwiki.apache.org/confluence/display/TOMCAT";>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://cwiki.apache.org/confluence/display/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="./source.html">Source code</a>
-</li>
-<li>
-<a href="./ci.html">Buildbot</a>
-</li>
-<li>
-<a href="https://cwiki.apache.org/confluence/x/vIPzBQ";>Translations</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="Table_of_Contents">Table of Contents</h3>
-<div class="text">
-
-<ul>
-<li>
-<a href="#General">General</a>
-</li>
-<li>
-<a href="#Migrating_from_8.0.x_or_8.5.x_to_9.0.x">Migrating from 8.0.x or 
8.5.x to 9.0.x</a>
-<ol>
-<li>
-<a href="#Java_8_required">Java 8 required</a>
-</li>
-<li>
-<a href="#Specification_APIs">Specification APIs</a>
-</li>
-<li>
-<a href="#Servlet_4.0_API">Servlet 4.0 API</a>
-</li>
-<li>
-<a href="#JavaServer_Pages_2.4">JavaServer Pages 2.4</a>
-</li>
-<li>
-<a href="#Expression_Language_3.1">Expression Language 3.1</a>
-</li>
-<li>
-<a href="#WebSocket_2.0">WebSocket 2.0</a>
-</li>
-<li>
-<a href="#BIO_connector_removed">BIO connector removed</a>
-</li>
-<li>
-<a href="#Comet_support_removed">Comet support removed</a>
-</li>
-<li>
-<a href="#HTTP/2_support_added">HTTP/2 support added</a>
-</li>
-<li>
-<a href="#TLS_virtual_hosting_and_multiple_certificate_support_added">TLS 
virtual hosting and multiple certificate support added</a>
-</li>
-<li>
-<a href="#Internal_APIs">Internal APIs</a>
-</li>
-<li>
-<a href="#JSR-77_implementation_removed">JSR-77 implementation removed</a>
-</li>
-<li>
-<a href="#Clustering">Clustering</a>
-</li>
-<li>
-<a href="#InstanceListener_removed">InstanceListener removed</a>
-</li>
-<li>
-<a href="#SessionManager">SessionManager</a>
-</li>
-<li>
-<a href="#Cookies">Cookies</a>
-</li>
-<li>
-<a href="#Web_applications">Web applications</a>
-</li>
-<li>
-<a href="#Engine_and_Host_configurations">Engine and Host configurations</a>
-</li>
-<li>
-<a href="#Context_configurations">Context configurations</a>
-</li>
-<li>
-<a href="#Logging">Logging</a>
-</li>
-</ol>
-</li>
-<li>
-<a href="#Upgrading_9.0.x">Upgrading 9.0.x</a>
-<ol>
-<li>
-<a href="#Tomcat_9.0.x_configuration_file_differences">Tomcat 9.0.x 
configuration file differences</a>
-</li>
-</ol>
-</li>
-</ul>
-
-</div>
-<h3 id="General">General</h3>
-<div class="text">
-
-
-<p>Please read general <a href="migration.html">Migration Guide page</a> first,
+                            </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-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://cwiki.apache.org/confluence/display/TOMCAT";>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://cwiki.apache.org/confluence/display/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="./source.html">Source 
code</a>
+                                        </li>
+                                        <li>
+                                            <a href="./ci.html">Buildbot</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://cwiki.apache.org/confluence/x/vIPzBQ";>Translations</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="Table_of_Contents">Table of Contents</h3>
+                            <div class="text">
+                                
+                                <ul>
+                                    <li>
+                                        <a href="#General">General</a>
+                                    </li>
+                                    <li>
+                                        <a 
href="#Migrating_from_8.0.x_or_8.5.x_to_9.0.x">Migrating from 8.0.x or 8.5.x to 
9.0.x</a>
+                                        <ol>
+                                            <li>
+                                                <a 
href="#Java_8_required">Java 8 required</a>
+                                            </li>
+                                            <li>
+                                                <a 
href="#Specification_APIs">Specification APIs</a>
+                                            </li>
+                                            <li>
+                                                <a 
href="#Servlet_4.0_API">Servlet 4.0 API</a>
+                                            </li>
+                                            <li>
+                                                <a 
href="#JavaServer_Pages_2.4">JavaServer Pages 2.4</a>
+                                            </li>
+                                            <li>
+                                                <a 
href="#Expression_Language_3.1">Expression Language 3.1</a>
+                                            </li>
+                                            <li>
+                                                <a 
href="#WebSocket_2.0">WebSocket 2.0</a>
+                                            </li>
+                                            <li>
+                                                <a 
href="#BIO_connector_removed">BIO connector removed</a>
+                                            </li>
+                                            <li>
+                                                <a 
href="#Comet_support_removed">Comet support removed</a>
+                                            </li>
+                                            <li>
+                                                <a 
href="#HTTP/2_support_added">HTTP/2 support added</a>
+                                            </li>
+                                            <li>
+                                                <a 
href="#TLS_virtual_hosting_and_multiple_certificate_support_added">TLS virtual 
hosting and multiple certificate support added</a>
+                                            </li>
+                                            <li>
+                                                <a 
href="#Internal_APIs">Internal APIs</a>
+                                            </li>
+                                            <li>
+                                                <a 
href="#JSR-77_implementation_removed">JSR-77 implementation removed</a>
+                                            </li>
+                                            <li>
+                                                <a 
href="#Clustering">Clustering</a>
+                                            </li>
+                                            <li>
+                                                <a 
href="#InstanceListener_removed">InstanceListener removed</a>
+                                            </li>
+                                            <li>
+                                                <a 
href="#SessionManager">SessionManager</a>
+                                            </li>
+                                            <li>
+                                                <a href="#Cookies">Cookies</a>
+                                            </li>
+                                            <li>
+                                                <a 
href="#Web_applications">Web applications</a>
+                                            </li>
+                                            <li>
+                                                <a 
href="#Engine_and_Host_configurations">Engine and Host configurations</a>
+                                            </li>
+                                            <li>
+                                                <a 
href="#Context_configurations">Context configurations</a>
+                                            </li>
+                                            <li>
+                                                <a href="#Logging">Logging</a>
+                                            </li>
+                                        </ol>
+                                    </li>
+                                    <li>
+                                        <a href="#Upgrading_9.0.x">Upgrading 
9.0.x</a>
+                                        <ol>
+                                            <li>
+                                                <a 
href="#Tomcat_9.0.x_configuration_file_differences">Tomcat 9.0.x configuration 
file differences</a>
+                                            </li>
+                                        </ol>
+                                    </li>
+                                </ul>
+                                
+                            </div>
+                            <h3 id="General">General</h3>
+                            <div class="text">
+                                
+                                <p>
+                                    Please read general <a 
href="migration.html">Migration Guide page</a> first,
 for common considerations that apply to migration or upgrade between versions
-of Apache Tomcat.</p>
-
-
-</div>
-<h3 id="Migrating_from_8.0.x_or_8.5.x_to_9.0.x">Migrating from 8.0.x or 8.5.x 
to 9.0.x</h3>
-<div class="text">
-
-  
-<p>This section lists all the known changes between 8.0.x / 8.5.x and 9.0.x
+of Apache Tomcat.
+                                </p>
+                                
+                            </div>
+                            <h3 
id="Migrating_from_8.0.x_or_8.5.x_to_9.0.x">Migrating from 8.0.x or 8.5.x to 
9.0.x</h3>
+                            <div class="text">
+                                  
+                                <p>This section lists all the known changes 
between 8.0.x / 8.5.x and 9.0.x
   which may cause backwards compatibility problems when upgrading. Some of
   these changes and new features are already present in Apache Tomcat 
8.5.x.</p>
-
-  
-<div class="subsection">
-<h4 id="Java_8_required">Java 8 required</h4>
-<div class="text">
-
-    
-<p>Apache Tomcat 9.0.x requires Java 8 or later. Apache Tomcat 8.0.x and 8.5.x
+                                  
+                                <div class="subsection">
+                                    <h4 id="Java_8_required">Java 8 
required</h4>
+                                    <div class="text">
+                                            
+                                        <p>Apache Tomcat 9.0.x requires Java 8 
or later. Apache Tomcat 8.0.x and 8.5.x
     required Java 7.</p>
-
-  
-</div>
-</div>
-
-  
-<div class="subsection">
-<h4 id="Specification_APIs">Specification APIs</h4>
-<div class="text">
-
-    
-<p>Apache Tomcat 9 supports the Java Servlet 4.0, JavaServer Pages 2.4,
+                                          
+                                    </div>
+                                </div>
+                                  
+                                <div class="subsection">
+                                    <h4 id="Specification_APIs">Specification 
APIs</h4>
+                                    <div class="text">
+                                            
+                                        <p>
+                                            Apache Tomcat 9 supports the Java 
Servlet 4.0, JavaServer Pages 2.4,
     Java Unified Expression Language 3.1 and Java API for WebSocket 2.0
     <a 
href="https://cwiki.apache.org/confluence/display/TOMCAT/Servlet+and+JSP+specifications";>specifications</a>.
     The changes between versions of specifications may be found in the
     <em>Changes</em> appendix in each of specification documents.
-    </p>
-
-  
-</div>
-</div>
-  
-  
-<div class="subsection">
-<h4 id="Servlet_4.0_API">Servlet 4.0 API</h4>
-<div class="text">
-  
     
-<p>In JSP pages that use wildcard import syntax the new classes added in
+                                        </p>
+                                          
+                                    </div>
+                                </div>
+                                  
+  
+                                <div class="subsection">
+                                    <h4 id="Servlet_4.0_API">Servlet 4.0 
API</h4>
+                                    <div class="text">
+                                          
+    
+                                        <p>
+                                            In JSP pages that use wildcard 
import syntax the new classes added in
     Servlet API may conflict with ones in web applications.
     For example, if package <code>"a"</code> contains class
     <code>PushBuilder</code>, the following JSP page will cease to compile in
-    Tomcat 9:</p>
-
-    
-<div class="codeBox">
-<pre>
-<code>&lt;%@page import="a.*"%&gt;
+    Tomcat 9:
+                                        </p>
+                                            
+                                        <div class="codeBox">
+                                            <pre>
+                                                <code>&lt;%@page 
import="a.*"%&gt;
 &lt;% PushBuilder pushBuilder = new PushBuilder(); %&gt;</code>
-</pre>
-</div>
-
-    
-<p>This happens because the implicit import of
+                                            </pre>
+                                        </div>
+                                            
+                                        <p>
+                                            This happens because the implicit 
import of
     <code>javax.servlet.http.*</code> and the explicit import of
     <code>a.*</code> will provide conflicting definitions of class
     <code>PushBuilder</code> that was added in Servlet 4.0. The solution is to
-    use the explicit import, <code>import="a.PushBuilder"</code>.</p>
-
-  
-</div>
-</div>
-
-  
-<div class="subsection">
-<h4 id="JavaServer_Pages_2.4">JavaServer Pages 2.4</h4>
-<div class="text">
-  
+    use the explicit import, <code>import="a.PushBuilder"</code>.
+                                        </p>
+                                          
+                                    </div>
+                                </div>
+                                  
+                                <div class="subsection">
+                                    <h4 id="JavaServer_Pages_2.4">JavaServer 
Pages 2.4</h4>
+                                    <div class="text">
+                                          
     
-<p>No information is currently available. It is anticipated that Java EE 8
+                                        <p>No information is currently 
available. It is anticipated that Java EE 8
     will include a maintenance release of JSP with a version of 2.4.</p>
-
-  
-</div>
-</div>
-
-  
-<div class="subsection">
-<h4 id="Expression_Language_3.1">Expression Language 3.1</h4>
-<div class="text">
-  
+                                          
+                                    </div>
+                                </div>
+                                  
+                                <div class="subsection">
+                                    <h4 
id="Expression_Language_3.1">Expression Language 3.1</h4>
+                                    <div class="text">
+                                          
     
-<p>No information is currently available. It is anticipated that Java EE 8
+                                        <p>No information is currently 
available. It is anticipated that Java EE 8
     will include a maintenance release of expression language with a version of
     3.1.</p>
-
-  
-</div>
-</div>
-
-  
-<div class="subsection">
-<h4 id="WebSocket_2.0">WebSocket 2.0</h4>
-<div class="text">
-  
+                                          
+                                    </div>
+                                </div>
+                                  
+                                <div class="subsection">
+                                    <h4 id="WebSocket_2.0">WebSocket 2.0</h4>
+                                    <div class="text">
+                                          
     
-<p>No information is currently available. It is anticipated that Java EE 8
+                                        <p>No information is currently 
available. It is anticipated that Java EE 8
     will include an updated Java API for WebSocket specification with a
     version of 2.0.</p>
-
-  
-</div>
-</div>
-
-  
-<div class="subsection">
-<h4 id="BIO_connector_removed">BIO connector removed</h4>
-<div class="text">
-
-    
-<p>
-<em>The following change is present in 8.5.0 onwards.</em>
-</p>
-
-    
-<p>The Java blocking IO implementation (BIO) for both HTTP and AJP has been
+                                          
+                                    </div>
+                                </div>
+                                  
+                                <div class="subsection">
+                                    <h4 id="BIO_connector_removed">BIO 
connector removed</h4>
+                                    <div class="text">
+                                            
+                                        <p>
+                                            <em>The following change is 
present in 8.5.0 onwards.</em>
+                                        </p>
+                                            
+                                        <p>The Java blocking IO implementation 
(BIO) for both HTTP and AJP has been
     removed. Users are recommended to switch to the Java non-blocking IO
     implementation (NIO).</p>
-
-  
-</div>
-</div>
-
-  
-<div class="subsection">
-<h4 id="Comet_support_removed">Comet support removed</h4>
-<div class="text">
-
-    
-<p>
-<em>The following change is present in 8.5.0 onwards.</em>
-</p>
-
-    
-<p>Comet support has been removed without a direct replacement. Applications
+                                          
+                                    </div>
+                                </div>
+                                  
+                                <div class="subsection">
+                                    <h4 id="Comet_support_removed">Comet 
support removed</h4>
+                                    <div class="text">
+                                            
+                                        <p>
+                                            <em>The following change is 
present in 8.5.0 onwards.</em>
+                                        </p>
+                                            
+                                        <p>Comet support has been removed 
without a direct replacement. Applications
     using Comet are recommended to migrate to WebSockets.</p>
-
-  
-</div>
-</div>
-
-  
-<div class="subsection">
-<h4 id="HTTP/2_support_added">HTTP/2 support added</h4>
-<div class="text">
-
-    
-<p>
-<em>The following feature is available since 8.5.0 onwards.</em>
-</p>
-
-    
-<p>HTTP/2 is supported for h2 (over TLS, negotiated via ALPN) and h2c (clear
+                                          
+                                    </div>
+                                </div>
+                                  
+                                <div class="subsection">
+                                    <h4 id="HTTP/2_support_added">HTTP/2 
support added</h4>
+                                    <div class="text">
+                                            
+                                        <p>
+                                            <em>The following feature is 
available since 8.5.0 onwards.</em>
+                                        </p>
+                                            
+                                        <p>
+                                            HTTP/2 is supported for h2 (over 
TLS, negotiated via ALPN) and h2c (clear
     text, negotiated via HTTP/1.1 upgrade). HTTP/2 needs to be explicitly
     enabled for a connector. To enable it, insert
-    <div class="codeBox">
-<pre>
-<code>&lt;UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" 
/&gt;</code>
-</pre>
-</div>
-    inside the connector for which you wish to enable HTTP/2. Note that to
-    enable HTTP/2 for a secure NIO or NIO2 connector, those connectors must be
-    using the OpenSSL engine for TLS.</p>
-
-  
-</div>
-</div>
-
-  
-<div class="subsection">
-<h4 id="TLS_virtual_hosting_and_multiple_certificate_support_added">TLS 
virtual hosting and multiple certificate support added</h4>
-<div class="text">
-
-    
-<p>
-<em>The following feature is available since 8.5.0 onwards.</em>
-</p>
-
     
-<p>Tomcat 9 supports multiple TLS virtual hosts for a single connector with
+                                            <div class="codeBox">
+                                                <pre>
+                                                    <code>&lt;UpgradeProtocol 
className="org.apache.coyote.http2.Http2Protocol" /&gt;</code>
+                                                </pre>
+                                            </div>
+                                                inside the connector for which 
you wish to enable HTTP/2. Note that to
+    enable HTTP/2 for a secure NIO or NIO2 connector, those connectors must be
+    using the OpenSSL engine for TLS.
+                                        </p>
+                                          
+                                    </div>
+                                </div>
+                                  
+                                <div class="subsection">
+                                    <h4 
id="TLS_virtual_hosting_and_multiple_certificate_support_added">TLS virtual 
hosting and multiple certificate support added</h4>
+                                    <div class="text">
+                                            
+                                        <p>
+                                            <em>The following feature is 
available since 8.5.0 onwards.</em>
+                                        </p>
+                                            
+                                        <p>
+                                            Tomcat 9 supports multiple TLS 
virtual hosts for a single connector with
     each virtual host able to support multiple certificates. Virtual host
     definitions are nested inside the Connector element with the default
     specified using the <strong>defaultSSLHostConfigName</strong> attribute on 
the
     Connector if more than one virtual host is specified. Certificate
-    definitions are nested inside the virtual host.</p>
-    
+    definitions are nested inside the virtual host.
+                                        </p>
+                                            
     
-<p>The following example shows how to use this to configure a single
+                                        <p>
+                                            The following example shows how to 
use this to configure a single
     APR/native connector for multiple TLS virtual hosts with each host having
     both an RSA and EC certificate.
     
-<div class="codeBox">
-<pre>
-<code>
+
+                                            <div class="codeBox">
+                                                <pre>
+                                                    <code>
 &lt;Connector port="8443"
            protocol="org.apache.coyote.http11.Http11AprProtocol"
            maxThreads="150"
@@ -527,305 +511,283 @@ of Apache Tomcat.</p>
     &lt;/SSLHostConfig&gt;
 &lt;/Connector&gt;
 </code>
-</pre>
-</div>
-</p>
-
-  
-</div>
-</div>
-
-  
-<div class="subsection">
-<h4 id="Internal_APIs">Internal APIs</h4>
-<div class="text">
-  
+                                                </pre>
+                                            </div>
+                                        </p>
+                                          
+                                    </div>
+                                </div>
+                                  
+                                <div class="subsection">
+                                    <h4 id="Internal_APIs">Internal APIs</h4>
+                                    <div class="text">
+                                          
     
-<p>Whilst the Tomcat 9 internal API is broadly compatible with Tomcat 8
+                                        <p>Whilst the Tomcat 9 internal API is 
broadly compatible with Tomcat 8
     there have been many changes at the detail level and they are not binary
     compatible. Developers of custom components that interact with Tomcat's
     internals should review the JavaDoc for the relevant API.</p>
-
-    
-<p>Of particular note are:</p>
-    
-<ul>
-      
-<li>Significant refactoring has taken place throughout the connectors to
+                                            
+                                        <p>Of particular note are:</p>
+                                            
+                                        <ul>
+                                                  
+                                            <li>
+                                                Significant refactoring has 
taken place throughout the connectors to
           reduce duplicate code and to align behaviour across
-          implementations. (<em>This change is present in 8.5.x.</em>)</li>
-      
-<li>The deprecated <code>digest</code> attribute has been removed from the
-          <code>Realm</code>. (<em>This change is present in 8.5.x.</em>)</li>
-    
-</ul>
-
-  
-</div>
-</div>
-
-  
-<div class="subsection">
-<h4 id="JSR-77_implementation_removed">JSR-77 implementation removed</h4>
-<div class="text">
-
-    
-<p>
-<em>The following change is present in 8.5.0 onwards.</em>
-</p>
-
-    
-<p>The JSR-77 implementation is incomplete and has been removed in 8.5.x and 
9.0.x.
+          implementations. (<em>This change is present in 8.5.x.</em>)
+                                            </li>
+                                                  
+                                            <li>
+                                                The deprecated 
<code>digest</code> attribute has been removed from the
+          <code>Realm</code>. (<em>This change is present in 8.5.x.</em>)
+                                            </li>
+                                                
+                                        </ul>
+                                          
+                                    </div>
+                                </div>
+                                  
+                                <div class="subsection">
+                                    <h4 
id="JSR-77_implementation_removed">JSR-77 implementation removed</h4>
+                                    <div class="text">
+                                            
+                                        <p>
+                                            <em>The following change is 
present in 8.5.0 onwards.</em>
+                                        </p>
+                                            
+                                        <p>The JSR-77 implementation is 
incomplete and has been removed in 8.5.x and 9.0.x.
     Specifically, the following methods that exposed to JMX have been removed.
     </p>
-
-    
-<ul>
-      
-<li>
-<code>StandardContext.getServlets()</code>
-</li>
-      
-<li>
-<code>StandardContext.isStateManageable()</code>
-</li>
-      
-<li>
-<code>StandardContext.getDeploymentDescriptor()</code>
-</li>
-      
-<li>
-<code>StandardWrapper.isStateManageable()</code>
-</li>
-    
-</ul>
-  
-</div>
-</div>
-
-  
-<div class="subsection">
-<h4 id="Clustering">Clustering</h4>
-<div class="text">
-
-    
-<p>
-<em>The following change is present in 8.5.0 onwards.</em>
-</p>
-
-    
-<p>
-<code>MessageDispatch15Interceptor</code> had been used to add the Java 5
+                                            
+                                        <ul>
+                                                  
+                                            <li>
+                                                
<code>StandardContext.getServlets()</code>
+                                            </li>
+                                                  
+                                            <li>
+                                                
<code>StandardContext.isStateManageable()</code>
+                                            </li>
+                                                  
+                                            <li>
+                                                
<code>StandardContext.getDeploymentDescriptor()</code>
+                                            </li>
+                                                  
+                                            <li>
+                                                
<code>StandardWrapper.isStateManageable()</code>
+                                            </li>
+                                                
+                                        </ul>
+                                          
+                                    </div>
+                                </div>
+                                  
+                                <div class="subsection">
+                                    <h4 id="Clustering">Clustering</h4>
+                                    <div class="text">
+                                            
+                                        <p>
+                                            <em>The following change is 
present in 8.5.0 onwards.</em>
+                                        </p>
+                                            
+                                        <p>
+                                            
<code>MessageDispatch15Interceptor</code> had been used to add the Java 5
     features to MessageDispatchInterceptor.
     <code>MessageDispatch15Interceptor</code> has been removed in Tomcat 8.5.x 
and 9.0.x
     by merging the Java 5 features to <code>MessageDispatchInterceptor</code>.
-    </p>
-
-  
-</div>
-</div>
-
-  
-<div class="subsection">
-<h4 id="InstanceListener_removed">InstanceListener removed</h4>
-<div class="text">
-
-    
-<p>
-<em>The following change is present in 8.5.0 onwards.</em>
-</p>
-
     
-<p>The support of InstanceListener has been removed in 8.5.x and 9.0.x.
+                                        </p>
+                                          
+                                    </div>
+                                </div>
+                                  
+                                <div class="subsection">
+                                    <h4 
id="InstanceListener_removed">InstanceListener removed</h4>
+                                    <div class="text">
+                                            
+                                        <p>
+                                            <em>The following change is 
present in 8.5.0 onwards.</em>
+                                        </p>
+                                            
+                                        <p>The support of InstanceListener has 
been removed in 8.5.x and 9.0.x.
     Specifically, the following classes have been removed.
     </p>
-
-    
-<ul>
-      
-<li>
-<code>org.apache.catalina.InstanceListener</code>
-</li>
-      
-<li>
-<code>org.apache.catalina.InstanceEvent</code>
-</li>
-      
-<li>
-<code>org.apache.catalina.util.InstanceSupport</code>
-</li>
-    
-</ul>
-  
-</div>
-</div>
-
-  
-<div class="subsection">
-<h4 id="SessionManager">SessionManager</h4>
-<div class="text">
-
-    
-<p>
-<em>The following change is present in 8.5.0 onwards.</em>
-</p>
-
-    
-<p>The following session manager attributes have been completely removed in
+                                            
+                                        <ul>
+                                                  
+                                            <li>
+                                                
<code>org.apache.catalina.InstanceListener</code>
+                                            </li>
+                                                  
+                                            <li>
+                                                
<code>org.apache.catalina.InstanceEvent</code>
+                                            </li>
+                                                  
+                                            <li>
+                                                
<code>org.apache.catalina.util.InstanceSupport</code>
+                                            </li>
+                                                
+                                        </ul>
+                                          
+                                    </div>
+                                </div>
+                                  
+                                <div class="subsection">
+                                    <h4 id="SessionManager">SessionManager</h4>
+                                    <div class="text">
+                                            
+                                        <p>
+                                            <em>The following change is 
present in 8.5.0 onwards.</em>
+                                        </p>
+                                            
+                                        <p>The following session manager 
attributes have been completely removed in
     8.5.x and 9.0.x.</p>
-
-    
-<ul>
-      
-<li>
-<code>distributable</code>
-</li>
-      
-<li>
-<code>maxInactiveInterval</code>
-</li>
-      
-<li>
-<code>sessionIdLength</code>
-</li>
-    
-</ul>
-
-    
-<p>The replacements are as follows:</p>
-    
-<ul>
-      
-<li>The <code>distributable</code> attribute has been deprecated in 8.0
+                                            
+                                        <ul>
+                                                  
+                                            <li>
+                                                <code>distributable</code>
+                                            </li>
+                                                  
+                                            <li>
+                                                
<code>maxInactiveInterval</code>
+                                            </li>
+                                                  
+                                            <li>
+                                                <code>sessionIdLength</code>
+                                            </li>
+                                                
+                                        </ul>
+                                            
+                                        <p>The replacements are as follows:</p>
+                                            
+                                        <ul>
+                                                  
+                                            <li>
+                                                The <code>distributable</code> 
attribute has been deprecated in 8.0
           and specified value is ignored. This should be configured via the
           Context. The value is inherited based on the presence or absence of
           the <code>&lt;distributable /&gt;</code> element in
           <code>/WEB-INF/web.xml.</code>
-</li>
-      
-<li>The <code>maxInactiveInterval</code> attribute has been deprecated in
+                                            </li>
+                                                  
+                                            <li>
+                                                The 
<code>maxInactiveInterval</code> attribute has been deprecated in
           8.0. If the value is specified, a warning log is issued. This should
           be configured via the Context. The value is inherited based on the
           value of the <code>&lt;session-timeout&gt;</code> element in
-          <code>/WEB-INF/web.xml</code>.</li>
-      
-<li>The <code>sessionIdLength</code> attribute of <code>Manager</code> has
+          <code>/WEB-INF/web.xml</code>.
+                                            </li>
+                                                  
+                                            <li>
+                                                The 
<code>sessionIdLength</code> attribute of <code>Manager</code> has
           been replaced by <code>sessionIdLength</code> attribute of
-          <code>SessionIdGenerator</code>.</li>
+          <code>SessionIdGenerator</code>.
+                                            </li>
+                                                
+                                        </ul>
+                                          
+                                    </div>
+                                </div>
+                                  
+                                <div class="subsection">
+                                    <h4 id="Cookies">Cookies</h4>
+                                    <div class="text">
+                                          
     
-</ul>
-  
-</div>
-</div>
-
-  
-<div class="subsection">
-<h4 id="Cookies">Cookies</h4>
-<div class="text">
-  
-    
-<p>The default <code>CookieProcessor</code> is now the
+                                        <p>
+                                            The default 
<code>CookieProcessor</code> is now the
     <code>Rfc6265CookieProcessor</code>. The <code>CookieProcessor</code> is
     configurable per <code>Context</code> and the
     <code>LegacyCookieProcessor</code> may be used to obtain the 8.0.x
-    behaviour.</p>
-
-  
-</div>
-</div>
-
-  
-<div class="subsection">
-<h4 id="Web_applications">Web applications</h4>
-<div class="text">
-  
+    behaviour.
+                                        </p>
+                                          
+                                    </div>
+                                </div>
+                                  
+                                <div class="subsection">
+                                    <h4 id="Web_applications">Web 
applications</h4>
+                                    <div class="text">
+                                          
     
-<p>The Manager and HostManager web applications are configured by default
+                                        <p>
+                                            The Manager and HostManager web 
applications are configured by default
        with a <code>RemoteAddrValve</code> that limits access to those
-       applications to connections from localhost.</p>
-
-  
-</div>
-</div>
-
-  
-<div class="subsection">
-<h4 id="Engine_and_Host_configurations">Engine and Host configurations</h4>
-<div class="text">
-
-    
-<p>The behaviour for <code>startStopThreads</code> has changed when the
+       applications to connections from localhost.
+                                        </p>
+                                          
+                                    </div>
+                                </div>
+                                  
+                                <div class="subsection">
+                                    <h4 
id="Engine_and_Host_configurations">Engine and Host configurations</h4>
+                                    <div class="text">
+                                            
+                                        <p>
+                                            The behaviour for 
<code>startStopThreads</code> has changed when the
     effective value is 1. In this case, children will be started on the current
     thread rather than via an <code>ExecutorService</code> configured with a
-    single thread.</p>
-
-  
-</div>
-</div>
-
-  
-<div class="subsection">
-<h4 id="Context_configurations">Context configurations</h4>
-<div class="text">
-
-    
-<p>The <code>clearReferencesStatic</code> attribute has been removed in
-    8.5.x and 9.0.x.</p>
-
-  
-</div>
-</div>
-
-  
-<div class="subsection">
-<h4 id="Logging">Logging</h4>
-<div class="text">
-
-    
-<p>By default the log files will be kept 90 days and then removed from the
+    single thread.
+                                        </p>
+                                          
+                                    </div>
+                                </div>
+                                  
+                                <div class="subsection">
+                                    <h4 id="Context_configurations">Context 
configurations</h4>
+                                    <div class="text">
+                                            
+                                        <p>
+                                            The 
<code>clearReferencesStatic</code> attribute has been removed in
+    8.5.x and 9.0.x.
+                                        </p>
+                                          
+                                    </div>
+                                </div>
+                                  
+                                <div class="subsection">
+                                    <h4 id="Logging">Logging</h4>
+                                    <div class="text">
+                                            
+                                        <p>By default the log files will be 
kept 90 days and then removed from the
     file system.</p>
-
-  
-</div>
-</div>
-
-
-</div>
-<h3 id="Upgrading_9.0.x">Upgrading 9.0.x</h3>
-<div class="text">
-  
-<p>When upgrading instances of Apache Tomcat from one version of Tomcat 9 to
+                                          
+                                    </div>
+                                </div>
+                                
+                            </div>
+                            <h3 id="Upgrading_9.0.x">Upgrading 9.0.x</h3>
+                            <div class="text">
+                                  
+                                <p>When upgrading instances of Apache Tomcat 
from one version of Tomcat 9 to
   another, particularly when using separate locations for $CATALINA_HOME and
   $CATALINA_BASE, it is necessary to ensure that any changes in the
   configuration files such as new attributes and changes to defaults are 
applied
   as part of the upgrade. To assist with the identification of these changes,
   the form below may be used to view the differences between the configuration
   files in different versions of Tomcat 9.</p>
-
-  
-<div class="subsection">
-<h4 id="Tomcat_9.0.x_configuration_file_differences">Tomcat 9.0.x 
configuration file differences</h4>
-<div class="text">
-
-    
-<p>Select a configuration file, old version and new version from the boxes
+                                  
+                                <div class="subsection">
+                                    <h4 
id="Tomcat_9.0.x_configuration_file_differences">Tomcat 9.0.x configuration 
file differences</h4>
+                                    <div class="text">
+                                            
+                                        <p>Select a configuration file, old 
version and new version from the boxes
     below and then click "View differences" to see the differences.
     The differences will be shown in a new tab/window.</p>
-
-    
-<p>
-<b>Note:</b> If there are no differences you will see an error page.</p>
-
-    
-<form action="https://gitbox.apache.org/repos/asf"; method="get" 
target="_blank">
-
-    
-<input type="hidden" name="p" value="tomcat.git">
+                                            
+                                        <p>
+                                            <b>Note:</b> If there are no 
differences you will see an error page.
+                                        </p>
+                                            
+                                        <form 
action="https://gitbox.apache.org/repos/asf"; method="get" target="_blank">
+                                                <input type="hidden" name="p" 
value="tomcat.git">
     <input type="hidden" name="a" value="blobdiff">
 
     
-<p>
-<label>Configuration file:
+                                            <p>
+                                                <label>Configuration file:
     <select name="f">
     <option value="conf/catalina.policy">catalina.policy</option>
     <option value="conf/catalina.properties">catalina.properties</option>
@@ -836,10 +798,10 @@ of Apache Tomcat.</p>
     <option value="conf/web.xml">web.xml</option>
     </select></label>
     
-</p>
-    
-<p>
-<label>Old version:
+                                            </p>
+                                                
+                                            <p>
+                                                <label>Old version:
     <select name="hpb">
     <option value="9.0.0-M1">9.0.0-M1</option>
     <option value="9.0.0-M3">9.0.0-M3</option>
@@ -926,43 +888,43 @@ of Apache Tomcat.</p>
     <option value="HEAD">trunk (unreleased)</option>
     </select></label>
     
-</p>
-
-    
-<p>
-    
-<button>View Differences</button>
-    
-</p>
-    
-</form>
-    
-<p>You can also use a Git command similar to the following from within a
+                                            </p>
+                                                
+                                            <p>
+                                                    <button>View 
Differences</button>
+    
+                                            </p>
+                                                
+                                        </form>
+                                            
+                                        <p>You can also use a Git command 
similar to the following from within a
        working copy:</p>
+                                            
+                                        <div class="codeBox">
+                                            <pre>
+                                                <code>git diff 9.0.0 9.0.12 -- 
conf/</code>
+                                            </pre>
+                                        </div>
+                                          
+                                    </div>
+                                </div>
+                                  
+
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </main>
+            <footer id="footer">
+                    Copyright &copy; 1999-2020, The Apache Software Foundation
     
-<div class="codeBox">
-<pre>
-<code>git diff 9.0.0 9.0.12 -- conf/</code>
-</pre>
-</div>
-  
-</div>
-</div>
-  
-
-</div>
-</div>
-</div>
-</div>
-</main>
-<footer id="footer">
-    Copyright &copy; 1999-2020, The Apache Software Foundation
-    <br>
-    Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
+                <br>
+                    Apache Tomcat, Tomcat, Apache, the Apache feather, and the 
Apache Tomcat
     project logo are either registered trademarks or trademarks of the Apache
     Software Foundation.
-  </footer>
-</div>
-<script src="res/js/tomcat.js"></script>
-</body>
+  
+            </footer>
+        </div>
+        <script src="res/js/tomcat.js"></script>
+    </body>
 </html>

Modified: tomcat/site/trunk/docs/migration.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration.html?rev=1873527&r1=1873526&r2=1873527&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration.html (original)
+++ tomcat/site/trunk/docs/migration.html Mon Feb  3 09:51:13 2020
@@ -1,304 +1,318 @@
 <!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; - Migration Guide</title>
-<meta name="author" content="Apache Tomcat Project">
-</head>
-<body>
-<div id="wrapper">
-<header id="header">
-<div class="clearfix">
-<div class="menu-toggler pull-left" tabindex="1">
-<div class="hamburger"></div>
-</div>
-<a href="http://tomcat.apache.org/";><img class="tomcat-logo pull-left noPrint" 
alt="Tomcat Home" src="res/images/tomcat.png"></a>
-<h1 class="pull-left">Apache Tomcat<sup>&reg;</sup>
-</h1>
-<div class="asf-logos pull-right">
-<a href="https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left"><img 
src="https://www.apache.org/images/SupportApache-small.png"; class="support-asf" 
alt="Support Apache"></a><a href="http://www.apache.org/"; target="_blank" 
class="pull-left"><img src="res/images/asf_logo.svg" class="asf-logo" alt="The 
Apache Software Foundation"></a>
-</div>
-</div>
-</header>
-<main id="middle">
-<div>
-<div id="mainLeft">
-<div id="nav-wrapper">
-<form action="https://www.google.com/search"; method="get">
-<div class="searchbox">
-<input value="tomcat.apache.org" name="sitesearch" type="hidden"><input 
aria-label="Search text" 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"; alt="Next ASF 
event"><br>
-              Save the date!
+    <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; - Migration Guide</title>
+        <meta name="author" content="Apache Tomcat Project">
+    </head>
+    <body>
+        <div id="wrapper">
+            <header id="header">
+                <div class="clearfix">
+                    <div class="menu-toggler pull-left" tabindex="1">
+                        <div class="hamburger"></div>
+                    </div>
+                    <a href="http://tomcat.apache.org/";><img 
class="tomcat-logo pull-left noPrint" alt="Tomcat Home" 
src="res/images/tomcat.png"></a>
+                    <h1 class="pull-left">
+                        Apache Tomcat<sup>&reg;</sup>
+                    </h1>
+                    <div class="asf-logos pull-right">
+                        <a 
href="https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left"><img 
src="https://www.apache.org/images/SupportApache-small.png"; class="support-asf" 
alt="Support Apache"></a><a href="http://www.apache.org/"; target="_blank" 
class="pull-left"><img src="res/images/asf_logo.svg" class="asf-logo" alt="The 
Apache Software Foundation"></a>
+                    </div>
+                </div>
+            </header>
+            <main id="middle">
+                <div>
+                    <div id="mainLeft">
+                        <div id="nav-wrapper">
+                            <form action="https://www.google.com/search"; 
method="get">
+                                <div class="searchbox">
+                                    <input value="tomcat.apache.org" 
name="sitesearch" type="hidden"><input aria-label="Search text" 
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"; alt="Next ASF 
event">
+                                    <br>
+                                                  Save the date!
             </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-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://cwiki.apache.org/confluence/display/TOMCAT";>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://cwiki.apache.org/confluence/display/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="./source.html">Source code</a>
-</li>
-<li>
-<a href="./ci.html">Buildbot</a>
-</li>
-<li>
-<a href="https://cwiki.apache.org/confluence/x/vIPzBQ";>Translations</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="Before_upgrading_or_migrating">Before upgrading or migrating</h3>
-<div class="text">
-
-
-<p>When updating from one major Apache Tomcat version a newer one, please make
+                            </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-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://cwiki.apache.org/confluence/display/TOMCAT";>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://cwiki.apache.org/confluence/display/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="./source.html">Source 
code</a>
+                                        </li>
+                                        <li>
+                                            <a href="./ci.html">Buildbot</a>
+                                        </li>
+                                        <li>
+                                            <a 
href="https://cwiki.apache.org/confluence/x/vIPzBQ";>Translations</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="Before_upgrading_or_migrating">Before 
upgrading or migrating</h3>
+                            <div class="text">
+                                
+                                <p>When updating from one major Apache Tomcat 
version a newer one, please make
 sure that the JVM that is installed on your system supports at least the
 required Java version. While it is possible that older versions of Tomcat may
 not be compatible with newer JVMs, all the currently supported Apache Tomcat
 versions (7.0.x, 8.5.x and 9.0.x) are known to run correctly on Java 8 
JVMs.</p>
-
-
-<p>When migrating from one major Tomcat version to another (e.g. from Tomcat 7
+                                
+                                <p>When migrating from one major Tomcat 
version to another (e.g. from Tomcat 7
 to Tomcat 8, or from Tomcat 8 to Tomcat 8.5),
 you should not copy the configuration files from the old version
 to the new version. The recommended approach is to start with the default
 configuration of the new version of Apache Tomcat and to adjust it as 
necessary.
 </p>
-
-
-<p>When migrating from one minor release to another minor release within the
+                                
+                                <p>When migrating from one minor release to 
another minor release within the
 same major release (e.g. from Tomcat 7.0.27 to Tomcat 7.0.28) you can retain 
the
 configuration files, but you should check to see if any defaults have changed
 and/or if any new elements have been added and adjust your configuration files
 accordingly.</p>
-
-</div>
-<h3 id="Migration_Guides">Migration Guides</h3>
-<div class="text">
-
-
-<p>For upgrading between 9.0.x versions, see the
+                                
+                            </div>
+                            <h3 id="Migration_Guides">Migration Guides</h3>
+                            <div class="text">
+                                
+                                <p>
+                                    For upgrading between 9.0.x versions, see 
the
 <a href="migration-9.html#Upgrading_9.0.x">upgrading</a> section of the Tomcat
-9.0.x Migration Guide.</p>
-  
-
-<p>For migration from 8.0.x / 8.5.x to 9.0.x, see the
-<a href="migration-9.html">Tomcat 9.0.x Migration Guide</a>.</p>
-
-
-<p>For upgrading between 8.5.x versions, see the
+9.0.x Migration Guide.
+                                </p>
+                                  
+
+                                <p>
+                                    For migration from 8.0.x / 8.5.x to 9.0.x, 
see the
+<a href="migration-9.html">Tomcat 9.0.x Migration Guide</a>.
+                                </p>
+                                
+                                <p>
+                                    For upgrading between 8.5.x versions, see 
the
 <a href="migration-85.html#Upgrading_8.5.x">upgrading</a> section of the Tomcat
-8.5.x Migration Guide.</p>
-
-
-<p>For migration from 8.0.x to 8.5.x, see the
-<a href="migration-85.html">Tomcat 8.5.x Migration Guide</a>.</p>
-
-
-<p>For upgrading between 8.0.x versions, see the
+8.5.x Migration Guide.
+                                </p>
+                                
+                                <p>
+                                    For migration from 8.0.x to 8.5.x, see the
+<a href="migration-85.html">Tomcat 8.5.x Migration Guide</a>.
+                                </p>
+                                
+                                <p>
+                                    For upgrading between 8.0.x versions, see 
the
 <a href="migration-8.html#Upgrading_8.0.x">upgrading</a> section of the Tomcat
-8.0.x Migration Guide.</p>
-  
-
-<p>For migration from 7.0.x to 8.0.x, see the
-<a href="migration-8.html">Tomcat 8.0.x Migration Guide</a>.</p>
-
-
-<p>For upgrading between 7.0.x versions, see the
+8.0.x Migration Guide.
+                                </p>
+                                  
+
+                                <p>
+                                    For migration from 7.0.x to 8.0.x, see the
+<a href="migration-8.html">Tomcat 8.0.x Migration Guide</a>.
+                                </p>
+                                
+                                <p>
+                                    For upgrading between 7.0.x versions, see 
the
 <a href="migration-7.html#Upgrading_7.0.x">upgrading</a> section of the Tomcat
-7.0.x Migration Guide.</p>
-  
-
-<p>For migration from 6.0.x to 7.0.x, see the
-<a href="migration-7.html">Tomcat 7.0.x Migration Guide</a>.</p>
-
-
-<p>For upgrading between 6.0.x versions, see the
+7.0.x Migration Guide.
+                                </p>
+                                  
+
+                                <p>
+                                    For migration from 6.0.x to 7.0.x, see the
+<a href="migration-7.html">Tomcat 7.0.x Migration Guide</a>.
+                                </p>
+                                
+                                <p>
+                                    For upgrading between 6.0.x versions, see 
the
 <a href="migration-6.html#Upgrading_6.0.x">upgrading</a> section of the Tomcat
-6.0.x Migration Guide.</p>
-  
-
-<p>For migration from 5.5.x to 6.0.x, see the
-<a href="migration-6.html">Tomcat 6.0.x Migration Guide</a>.</p>
-
-
-</div>
-</div>
-</div>
-</div>
-</main>
-<footer id="footer">
-    Copyright &copy; 1999-2020, The Apache Software Foundation
-    <br>
-    Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
+6.0.x Migration Guide.
+                                </p>
+                                  
+
+                                <p>
+                                    For migration from 5.5.x to 6.0.x, see the
+<a href="migration-6.html">Tomcat 6.0.x Migration Guide</a>.
+                                </p>
+                                
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </main>
+            <footer id="footer">
+                    Copyright &copy; 1999-2020, 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