Author: markt
Date: Fri Oct 16 12:03:45 2015
New Revision: 1708968
URL: http://svn.apache.org/viewvc?rev=1708968&view=rev
Log:
Re-organise migration guide so it is easier on the eye (fewer sections)
Add a section for 9.0.x migration.
Added:
tomcat/site/trunk/docs/migration-9.html (with props)
tomcat/site/trunk/xdocs/migration-9.xml (with props)
Modified:
tomcat/site/trunk/docs/migration.html
tomcat/site/trunk/xdocs/migration.xml
Added: tomcat/site/trunk/docs/migration-9.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-9.html?rev=1708968&view=auto
==============================================================================
--- tomcat/site/trunk/docs/migration-9.html (added)
+++ tomcat/site/trunk/docs/migration-9.html Fri Oct 16 12:03:45 2015
@@ -0,0 +1,457 @@
+<!DOCTYPE html SYSTEM "about:legacy-compat">
+<html lang="en">
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
+<title>Apache Tomcat - Migration Guide - Tomcat 9.0.x</title>
+<meta name="author" content="Apache Tomcat Project">
+</head>
+<body>
+<div id="wrapper">
+<header>
+<div id="header">
+<div>
+<div>
+<div class="logo noPrint">
+<a href="http://tomcat.apache.org/";><img alt="Tomcat Home"
src="./images/tomcat.png"></a>
+</div>
+<div style="height: 1px;"></div>
+<div class="asfLogo noPrint">
+<a href="http://www.apache.org/"; target="_blank"><img
src="//www.apache.org/images/feather.png" alt="The Apache Software Foundation"
style="width: 266px; height: 83px;"></a>
+</div>
+<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<div style="clear: right;"></div>
+<div class="searchbox noPrint">
+<form action="https://www.google.com/search"; method="get">
+<input value="tomcat.apache.org" name="sitesearch" type="hidden"><input
placeholder="Search the Site…" required="required" size="25" name="q"
id="query" type="search"><button>Search</button>
+</form>
+</div>
+<div style="height: 1px;"></div>
+<div style="clear: left;"></div>
+</div>
+</div>
+</div>
+</header>
+<div id="middle">
+<div>
+<div id="mainLeft" class="noprint">
+<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="./download-80.cgi">Tomcat 8.0</a>
+</li>
+<li>
+<a href="./download-70.cgi">Tomcat 7.0</a>
+</li>
+<li>
+<a href="./download-60.cgi">Tomcat 6.0</a>
+</li>
+<li>
+<a href="./download-connectors.cgi">Tomcat Connectors</a>
+</li>
+<li>
+<a href="./download-native.cgi">Tomcat Native</a>
+</li>
+<li>
+<a href="./download-taglibs.cgi">Taglibs</a>
+</li>
+<li>
+<a href="http://archive.apache.org/dist/tomcat/";>Archives</a>
+</li>
+</ul>
+</div>
+<div>
+<h2>Documentation</h2>
+<ul>
+<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="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
+</li>
+<li>
+<a href="./connectors-doc/">Tomcat Connectors</a>
+</li>
+<li>
+<a href="./native-doc/">Tomcat Native</a>
+</li>
+<li>
+<a href="http://wiki.apache.org/tomcat/FrontPage";>Wiki</a>
+</li>
+<li>
+<a href="./migration.html">Migration Guide</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="http://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">SVN Repositories</a>
+</li>
+<li>
+<a href="./ci.html">Buildbot</a>
+</li>
+<li>
+<a href="https://reviews.apache.org/groups/tomcat/";>Reviewboard</a>
+</li>
+<li>
+<a href="./tools.html">Tools</a>
+</li>
+</ul>
+</div>
+<div>
+<h2>Media</h2>
+<ul>
+<li>
+<a href="http://blogs.apache.org/tomcat/";>Blog</a>
+</li>
+<li>
+<a href="http://twitter.com/theapachetomcat";>Twitter</a>
+</li>
+</ul>
+</div>
+<div>
+<h2>Misc</h2>
+<ul>
+<li>
+<a href="./whoweare.html">Who We Are</a>
+</li>
+<li>
+<a href="./heritage.html">Heritage</a>
+</li>
+<li>
+<a href="http://www.apache.org";>Apache Home</a>
+</li>
+<li>
+<a href="./resources.html">Resources</a>
+</li>
+<li>
+<a href="./contact.html">Contact</a>
+</li>
+<li>
+<a href="./legal.html">Legal</a>
+</li>
+<li>
+<a href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a>
+</li>
+<li>
+<a href="http://www.apache.org/foundation/thanks.html";>Thanks</a>
+</li>
+</ul>
+</div>
+</nav>
+</div>
+</div>
+<div id="mainRight">
+<div id="content">
+<h2 style="display: none;">Content</h2>
+<h3 id="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_to_9.0.x">Migrating from 8.0.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.3">JavaServer Pages 2.3</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_virtua_hosting_and_multiple_certificate_support_added">TLS
virtua hosting and multiple certificate support added</a>
+</li>
+<li>
+<a href="#Internal_APIs">Internal APIs</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_to_9.0.x">Migrating from 8.0.x to 9.0.x</h3>
+<div class="text">
+
+
+<p> This section lists all the known changes between 8.0.x and 9.0.x which may
+ cause backwards compatibility problems when upgrading.</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
+ 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,
+ Java Unified Expression Language 3.1 and Java WebSocket 2.0
+ <a href="http://wiki.apache.org/tomcat/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
+ 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 8:</p>
+
+
+<div class="codeBox">
+<pre>
+<code><%@page import="a.*"%>
+<% PushBuilder pushBuilder = new PushBuilder(); %></code>
+</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.3">JavaServer Pages 2.3</h4>
+<div class="text">
+
+
+<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">
+
+
+<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">
+
+
+<p>No information is currently available. It is anticipated that Java EE 8
+ will include an updated 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>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>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>TODO.</p>
+
+
+</div>
+</div>
+
+
+<div class="subsection">
+<h4 id="TLS_virtua_hosting_and_multiple_certificate_support_added">TLS virtua
hosting and multiple certificate support added</h4>
+<div class="text">
+
+
+<p>TODO.</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
+ 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
+ reduce duplicate code and to align behaviour across implementations.
+ </li>
+
+</ul>
+
+
+</div>
+</div>
+
+
+</div>
+</div>
+</div>
+</div>
+</div>
+<footer>
+<div id="footer">
+ Copyright © 1999-2015, The Apache Software Foundation
+ <br>
+ Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
+ project logo are trademarks of the Apache Software Foundation.
+ </div>
+</footer>
+</div>
+</body>
+</html>
Propchange: tomcat/site/trunk/docs/migration-9.html
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tomcat/site/trunk/docs/migration.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration.html?rev=1708968&r1=1708967&r2=1708968&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration.html (original)
+++ tomcat/site/trunk/docs/migration.html Fri Oct 16 12:03:45 2015
@@ -203,71 +203,58 @@
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 (6.0.x and 7.0.x) are known to run correctly on Java 6 JVMs.</p>
+versions (6.0.x, 7.0.x, 8.0.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 6
-to Tomcat 7), you should not blindly copy the configuration files from the old
-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 major Tomcat version to another (e.g. from Tomcat 7
+to Tomcat 8), 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
-same major release (e.g. from Tomcat 7.0.14 to Tomcat 7.0.16) you can retain
the
+same major release (e.g. from Tomcat 8.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="Migrating_from_5.5.x_to_6.0.x">Migrating from 5.5.x to 6.0.x</h3>
+<h3 id="Migration_Guides">Migration Guides</h3>
<div class="text">
-<p>See <a href="migration-6.html">Migration Guide - Tomcat 6.0.x</a>.</p>
+<p>For migration from 8.0.x to 9.0.x, see the
+<a href="migration-9.html">Tomcat 9.0.x Migration Guide</a>.</p>
-</div>
-<h3 id="Upgrading_between_6.0.x_versions">Upgrading between 6.0.x versions</h3>
-<div class="text">
-
-
-<p>See <a href="migration-6.html#Upgrading_6.0.x">Migration Guide
-- Tomcat 6.0.x</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>
-</div>
-<h3 id="Migrating_from_6.0.x_to_7.0.x">Migrating from 6.0.x to 7.0.x</h3>
-<div class="text">
-
-
-<p>See <a href="migration-7.html">Migration Guide - Tomcat 7.0.x</a>.</p>
-
-
-</div>
-<h3 id="Upgrading_between_7.0.x_versions">Upgrading between 7.0.x versions</h3>
-<div class="text">
+<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>See <a href="migration-7.html#Upgrading_7.0.x">Migration Guide
-- Tomcat 7.0.x</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>
-</div>
-<h3 id="Migrating_from_7.0.x_to_8.0.x">Migrating from 7.0.x to 8.0.x</h3>
-<div class="text">
-
+<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>See <a href="migration-8.html">Migration Guide - Tomcat 8.0.x</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>
+
-</div>
-<h3 id="Upgrading_between_8.0.x_versions">Upgrading between 8.0.x versions</h3>
-<div class="text">
-
+<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>
-<p>See <a href="migration-8.html#Upgrading_8.0.x">Migration Guide
-- Tomcat 8.0.x</a>.</p>
-
</div>
</div>
Added: tomcat/site/trunk/xdocs/migration-9.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-9.xml?rev=1708968&view=auto
==============================================================================
--- tomcat/site/trunk/xdocs/migration-9.xml (added)
+++ tomcat/site/trunk/xdocs/migration-9.xml Fri Oct 16 12:03:45 2015
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document>
+
+ <properties>
+ <author>Apache Tomcat Project</author>
+ <title>Migration Guide - Tomcat 9.0.x</title>
+ </properties>
+
+<body>
+
+<section name="Table of Contents">
+<toc/>
+</section>
+
+<section name="General">
+
+<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>
+
+</section>
+
+<section name="Migrating from 8.0.x to 9.0.x">
+
+ <p> This section lists all the known changes between 8.0.x and 9.0.x which
may
+ cause backwards compatibility problems when upgrading.</p>
+
+ <subsection name="Java 8 required">
+
+ <p>Apache Tomcat 9.0.x requires Java 8 or later. Apache Tomcat 8.0.x
+ required Java 7.</p>
+
+ </subsection>
+
+ <subsection name="Specification APIs">
+
+ <p>Apache Tomcat 9 supports the Java Servlet 4.0, JavaServer Pages 2.4,
+ Java Unified Expression Language 3.1 and Java WebSocket 2.0
+ <a href="http://wiki.apache.org/tomcat/Specifications";>specifications</a>.
+ The changes between versions of specifications may be found in the
+ <em>Changes</em> appendix in each of specification documents.
+ </p>
+
+ </subsection>
+
+ <subsection name="Servlet 4.0 API">
+
+ <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 8:</p>
+
+ <source><![CDATA[<%@page import="a.*"%>
+<% PushBuilder pushBuilder = new PushBuilder(); %>]]></source>
+
+ <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>
+
+ </subsection>
+
+ <subsection name="JavaServer Pages 2.3">
+
+ <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>
+
+ </subsection>
+
+ <subsection name="Expression Language 3.1">
+
+ <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>
+
+ </subsection>
+
+ <subsection name="WebSocket 2.0">
+
+ <p>No information is currently available. It is anticipated that Java EE 8
+ will include an updated WebSocket specification with a version of 2.0.</p>
+
+ </subsection>
+
+ <subsection name="BIO connector removed">
+
+ <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>
+
+ </subsection>
+
+ <subsection name="Comet support removed">
+
+ <p>Comet support has been removed without a direct replacement.
Applications
+ using Comet are recommended to migrate to WebSockets.</p>
+
+ </subsection>
+
+ <subsection name="HTTP/2 support added">
+
+ <p>TODO.</p>
+
+ </subsection>
+
+ <subsection name="TLS virtua hosting and multiple certificate support added">
+
+ <p>TODO.</p>
+
+ </subsection>
+
+ <subsection name="Internal APIs">
+
+ <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
+ reduce duplicate code and to align behaviour across implementations.
+ </li>
+ </ul>
+
+ </subsection>
+
+</section>
+
+</body>
+</document>
Propchange: tomcat/site/trunk/xdocs/migration-9.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tomcat/site/trunk/xdocs/migration.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration.xml?rev=1708968&r1=1708967&r2=1708968&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/migration.xml (original)
+++ tomcat/site/trunk/xdocs/migration.xml Fri Oct 16 12:03:45 2015
@@ -14,57 +14,48 @@
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 (6.0.x and 7.0.x) are known to run correctly on Java 6 JVMs.</p>
+versions (6.0.x, 7.0.x, 8.0.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 6
-to Tomcat 7), you should not blindly copy the configuration files from the old
-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 major Tomcat version to another (e.g. from Tomcat 7
+to Tomcat 8), 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
-same major release (e.g. from Tomcat 7.0.14 to Tomcat 7.0.16) you can retain
the
+same major release (e.g. from Tomcat 8.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>
</section>
-<section name="Migrating from 5.5.x to 6.0.x">
+<section name="Migration Guides">
-<p>See <a href="migration-6.html">Migration Guide - Tomcat 6.0.x</a>.</p>
+<p>For migration from 8.0.x to 9.0.x, see the
+<a href="migration-9.html">Tomcat 9.0.x Migration Guide</a>.</p>
-</section>
-
-<section name="Upgrading between 6.0.x versions">
-
-<p>See <a href="migration-6.html#Upgrading_6.0.x">Migration Guide
-- Tomcat 6.0.x</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>
-</section>
-
-<section name="Migrating from 6.0.x to 7.0.x">
-
-<p>See <a href="migration-7.html">Migration Guide - Tomcat 7.0.x</a>.</p>
-
-</section>
+<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>
-<section name="Upgrading between 7.0.x versions">
-
-<p>See <a href="migration-7.html#Upgrading_7.0.x">Migration Guide
-- Tomcat 7.0.x</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>
-</section>
-
-<section name="Migrating from 7.0.x to 8.0.x">
-
-<p>See <a href="migration-8.html">Migration Guide - Tomcat 8.0.x</a>.</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>
-</section>
-
-<section name="Upgrading between 8.0.x versions">
-
-<p>See <a href="migration-8.html#Upgrading_8.0.x">Migration Guide
-- Tomcat 8.0.x</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>
+
</section>
</body>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
