Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 114C243F2 for ; Mon, 27 Jun 2011 23:29:29 +0000 (UTC) Received: (qmail 16870 invoked by uid 500); 27 Jun 2011 23:29:28 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 16799 invoked by uid 500); 27 Jun 2011 23:29:27 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 16788 invoked by uid 99); 27 Jun 2011 23:29:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Jun 2011 23:29:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Jun 2011 23:29:25 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 667BF23888CB for ; Mon, 27 Jun 2011 23:29:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1140370 - in /tomcat/site/trunk: docs/migration.html xdocs/migration.xml Date: Mon, 27 Jun 2011 23:29:04 -0000 To: dev@tomcat.apache.org From: kkolinko@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110627232904.667BF23888CB@eris.apache.org> Author: kkolinko Date: Mon Jun 27 23:29:04 2011 New Revision: 1140370 URL: http://svn.apache.org/viewvc?rev=1140370&view=rev Log: migration.html: 1) preselect the last and next-to-last versions in configuration comparison form 2) added HEAD revision to the list of versions, placed both version fields on the same line. 3) s/catalina.sh/setenv.sh/ when talking about configuring JAVA_ENDORSED_DIRS 4) some spaces and comma 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=1140370&r1=1140369&r2=1140370&view=diff ============================================================================== --- tomcat/site/trunk/docs/migration.html (original) +++ tomcat/site/trunk/docs/migration.html Mon Jun 27 23:29:04 2011 @@ -346,14 +346,14 @@ required Java version. While it is possi not be compatible with newer JVMs, all the currently supported Apache Tomcat versions (5.5.x, 6.0.x and 7.0.x) are known to run correctly on Java 6 JVMs.

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 +

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.

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 -configuration files but you should check to see if any defaults have changed +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.

@@ -499,8 +499,8 @@ accordingly.

absent by default.

The JAVA_ENDORSED_DIRS environment variable can be used - with catalina.bat|sh scripts to provide alternative location of this - directory.

+ with setenv.bat|sh scripts to provide alternative + location of this directory.

@@ -880,11 +880,9 @@ accordingly.

- + - -

New version: + , new version:

@@ -1588,11 +1587,9 @@ accordingly.

- + - -

New version: + , new version:

Modified: tomcat/site/trunk/xdocs/migration.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration.xml?rev=1140370&r1=1140369&r2=1140370&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/migration.xml (original) +++ tomcat/site/trunk/xdocs/migration.xml Mon Jun 27 23:29:04 2011 @@ -20,14 +20,14 @@ required Java version. While it is possi not be compatible with newer JVMs, all the currently supported Apache Tomcat versions (5.5.x, 6.0.x and 7.0.x) are known to run correctly on Java 6 JVMs.

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 +

@@ -73,8 +73,8 @@ accordingly.

absent by default.

The JAVA_ENDORSED_DIRS environment variable can be used - with catalina.bat|sh scripts to provide alternative location of this - directory.

+ with setenv.bat|sh scripts to provide alternative + location of this directory.

@@ -249,11 +249,9 @@ accordingly.

- + - -

New version: + , new version:

@@ -610,11 +609,9 @@ accordingly.

- + - -

New version: + , new version:

--------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org