tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kkoli...@apache.org
Subject svn commit: r1140370 - in /tomcat/site/trunk: docs/migration.html xdocs/migration.xml
Date Mon, 27 Jun 2011 23:29:04 GMT
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.</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
+<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 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.</p>
 </blockquote>
@@ -499,8 +499,8 @@ accordingly.</p>
     absent by default.</p>
 
     <p>The <code>JAVA_ENDORSED_DIRS</code> environment variable can be
used
-    with catalina.bat|sh scripts to provide alternative location of this
-    directory.</p>
+    with <code>setenv.bat</code>|<code>sh</code> scripts to provide
alternative
+    location of this directory.</p>
     </blockquote>
 </td>
 </tr>
@@ -880,11 +880,9 @@ accordingly.</p>
     <option value="920929">6.0.26</option>
     <option value="958987">6.0.28</option>
     <option value="965461">6.0.29</option>
-    <option value="1057276">6.0.30</option>
+    <option value="1057276" selected="selected">6.0.30</option>
     <option value="1066582">6.0.32</option>
-    </select>
-    </p>
-    <p>New version:
+    </select>, new version:
     <select name="r2">
     <option value="466306">6.0.0</option>
     <option value="472328">6.0.1</option>
@@ -905,7 +903,8 @@ accordingly.</p>
     <option value="958987">6.0.28</option>
     <option value="965461">6.0.29</option>
     <option value="1057276">6.0.30</option>
-    <option value="1066582">6.0.32</option>
+    <option value="1066582" selected="selected">6.0.32</option>
+    <option value="HEAD">trunk (unreleased)</option>
     </select>
     </p>
     <p>
@@ -1588,11 +1587,9 @@ accordingly.</p>
     <option value="1078282">7.0.10</option>
     <option value="1080182">7.0.11</option>
     <option value="1087797">7.0.12</option>
-    <option value="1101230">7.0.14</option>
+    <option value="1101230" selected="selected">7.0.14</option>
     <option value="1134562">7.0.16</option>
-    </select>
-    </p>
-    <p>New version:
+    </select>, new version:
     <select name="r2">
     <option value="954232">7.0.0</option>
     <option value="982035">7.0.2</option>
@@ -1604,7 +1601,8 @@ accordingly.</p>
     <option value="1080182">7.0.11</option>
     <option value="1087797">7.0.12</option>
     <option value="1101230">7.0.14</option>
-    <option value="1134562">7.0.16</option>
+    <option value="1134562" selected="selected">7.0.16</option>
+    <option value="HEAD">trunk (unreleased)</option>
     </select>
     </p>
     <p>

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.</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
+<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 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.</p>
 </section>
@@ -73,8 +73,8 @@ accordingly.</p>
     absent by default.</p>
 
     <p>The <code>JAVA_ENDORSED_DIRS</code> environment variable can be
used
-    with catalina.bat|sh scripts to provide alternative location of this
-    directory.</p>
+    with <code>setenv.bat</code>|<code>sh</code> scripts to provide
alternative
+    location of this directory.</p>
     </subsection>
 
     <subsection name="Default web applications">
@@ -249,11 +249,9 @@ accordingly.</p>
     <option value="920929">6.0.26</option>
     <option value="958987">6.0.28</option>
     <option value="965461">6.0.29</option>
-    <option value="1057276">6.0.30</option>
+    <option value="1057276" selected="selected">6.0.30</option>
     <option value="1066582">6.0.32</option>
-    </select>
-    </p>
-    <p>New version:
+    </select>, new version:
     <select name="r2">
     <option value="466306">6.0.0</option>
     <option value="472328">6.0.1</option>
@@ -274,7 +272,8 @@ accordingly.</p>
     <option value="958987">6.0.28</option>
     <option value="965461">6.0.29</option>
     <option value="1057276">6.0.30</option>
-    <option value="1066582">6.0.32</option>
+    <option value="1066582" selected="selected">6.0.32</option>
+    <option value="HEAD">trunk (unreleased)</option>
     </select>
     </p>
     <p>
@@ -610,11 +609,9 @@ accordingly.</p>
     <option value="1078282">7.0.10</option>
     <option value="1080182">7.0.11</option>
     <option value="1087797">7.0.12</option>
-    <option value="1101230">7.0.14</option>
+    <option value="1101230" selected="selected">7.0.14</option>
     <option value="1134562">7.0.16</option>
-    </select>
-    </p>
-    <p>New version:
+    </select>, new version:
     <select name="r2">
     <option value="954232">7.0.0</option>
     <option value="982035">7.0.2</option>
@@ -626,7 +623,8 @@ accordingly.</p>
     <option value="1080182">7.0.11</option>
     <option value="1087797">7.0.12</option>
     <option value="1101230">7.0.14</option>
-    <option value="1134562">7.0.16</option>
+    <option value="1134562" selected="selected">7.0.16</option>
+    <option value="HEAD">trunk (unreleased)</option>
     </select>
     </p>
     <p>



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


Mime
View raw message