Author: kkolinko
Date: Tue Dec 13 02:00:49 2016
New Revision: 1773914
URL: http://svn.apache.org/viewvc?rev=1773914&view=rev
Log:
1). Followup to r1773840 - Fix typo in the source file, not in a generated one.
For BZ 60472.
See ../README.txt for details on how the site is generated.
2). Add mention of Tomcat 8.5.
Modified:
tomcat/site/trunk/docs/migration.html
tomcat/site/trunk/xdocs/migration.xml
Modified: tomcat/site/trunk/docs/migration.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration.html?rev=1773914&r1=1773913&r2=1773914&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration.html (original)
+++ tomcat/site/trunk/docs/migration.html Tue Dec 13 02:00:49 2016
@@ -219,12 +219,13 @@
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, 7.0.x, 8.0.x and 9.0.x) are known to run correctly on Java 8
-JVMs.</p>
+versions (6.0.x, 7.0.x, 8.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
-to Tomcat 8), you should not copy the configuration files from the old version
+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>
Modified: tomcat/site/trunk/xdocs/migration.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration.xml?rev=1773914&r1=1773913&r2=1773914&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/migration.xml (original)
+++ tomcat/site/trunk/xdocs/migration.xml Tue Dec 13 02:00:49 2016
@@ -14,17 +14,18 @@
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, 7.0.x, 8.0.x and 9.0.x) are known to run correctly on Java 8
-JVMs.</p>
+versions (6.0.x, 7.0.x, 8.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
-to Tomcat 8), you should not copy the configuration files from the old version
+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
-same major release (e.g. from Tomcat 8.0.27 to Tomcat 7.0.28) you can retain
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>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
