Author: markt Date: Fri Feb 21 12:42:21 2020 New Revision: 1874317 URL: http://svn.apache.org/viewvc?rev=1874317&view=rev Log: First pass at updating the migration guide
Modified: tomcat/site/trunk/docs/migration-9.html tomcat/site/trunk/docs/migration.html tomcat/site/trunk/xdocs/migration-9.xml tomcat/site/trunk/xdocs/migration.xml Modified: tomcat/site/trunk/docs/migration-9.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-9.html?rev=1874317&r1=1874316&r2=1874317&view=diff ============================================================================== --- tomcat/site/trunk/docs/migration-9.html (original) +++ tomcat/site/trunk/docs/migration-9.html Fri Feb 21 12:42:21 2020 @@ -24,9 +24,9 @@ of Apache Tomcat.</p> <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>. + <p>Apache Tomcat 9 supports the Java Servlet 4.0, JavaServer Pages 2.3, + Java Unified Expression Language 3.0 and Java API for WebSocket 1.0 + <a href="https://cwiki.apache.org/confluence/display/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> Modified: tomcat/site/trunk/docs/migration.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration.html?rev=1874317&r1=1874316&r2=1874317&view=diff ============================================================================== --- tomcat/site/trunk/docs/migration.html (original) +++ tomcat/site/trunk/docs/migration.html Fri Feb 21 12:42:21 2020 @@ -7,7 +7,8 @@ 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> +versions (7.0.x, 8.5.x, 9.0.x and 10.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 to Tomcat 8, or from Tomcat 8 to Tomcat 8.5), @@ -23,6 +24,13 @@ and/or if any new elements have been add accordingly.</p> </div><h3 id="Migration_Guides">Migration Guides</h3><div class="text"> +<p>For upgrading between 10.0.x versions, see the +<a href="migration-10.html#Upgrading_10.0.x">upgrading</a> section of the Tomcat +10.0.x Migration Guide.</p> + +<p>For migration from 9.0.x to 10.0.x, see the +<a href="migration-10.html">Tomcat 10.0.x Migration Guide</a>.</p> + <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> Modified: tomcat/site/trunk/xdocs/migration-9.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-9.xml?rev=1874317&r1=1874316&r2=1874317&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/migration-9.xml (original) +++ tomcat/site/trunk/xdocs/migration-9.xml Fri Feb 21 12:42:21 2020 @@ -35,9 +35,9 @@ of Apache Tomcat.</p> <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 API for WebSocket 2.0 - <a href="https://cwiki.apache.org/confluence/display/TOMCAT/Servlet+and+JSP+specifications">specifications</a>. + <p>Apache Tomcat 9 supports the Java Servlet 4.0, JavaServer Pages 2.3, + Java Unified Expression Language 3.0 and Java API for WebSocket 1.0 + <a href="https://cwiki.apache.org/confluence/display/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> Modified: tomcat/site/trunk/xdocs/migration.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration.xml?rev=1874317&r1=1874316&r2=1874317&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/migration.xml (original) +++ tomcat/site/trunk/xdocs/migration.xml Fri Feb 21 12:42:21 2020 @@ -14,7 +14,8 @@ 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> +versions (7.0.x, 8.5.x, 9.0.x and 10.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 to Tomcat 8, or from Tomcat 8 to Tomcat 8.5), @@ -32,6 +33,13 @@ accordingly.</p> <section name="Migration Guides"> +<p>For upgrading between 10.0.x versions, see the +<a href="migration-10.html#Upgrading_10.0.x">upgrading</a> section of the Tomcat +10.0.x Migration Guide.</p> + +<p>For migration from 9.0.x to 10.0.x, see the +<a href="migration-10.html">Tomcat 10.0.x Migration Guide</a>.</p> + <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> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org