Fix bug 42401. Provide better JRE/JDK information.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@537518 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/RUNNING.txt b/RUNNING.txt
index 11955ab..1064b96 100644 (file)
--- a/RUNNING.txt
+++ b/RUNNING.txt
@@ -18,9 +18,13 @@ Running With JRE 5.0 Or Later
 
 (1.2) Install the JRE according to the instructions included with the
       release.
+(1.3) Set an environment variable named JRE_HOME to the pathname of
+      the directory into which you installed the JRE, e.g. c:\jre5.0
+      or /usr/local/java/jre5.0.
 
-(1.3) Set an environment variable named JAVA_HOME to the pathname of
-      the directory into which you installed the JRE, e.g. c:\j2sdk5.0
+NOTE: You may also use the full JDK rather than just the JRE. In this
+      case set your JAVA_HOME environment variable to the pathname of
+      the directory into which you installed the JDK, e.g. c:\j2sdk5.0
       or /usr/local/java/j2sdk5.0.
 
 

diff --git a/bin/catalina.bat b/bin/catalina.bat
index b7fd7de..9810e5e 100644 (file)
--- a/bin/catalina.bat
+++ b/bin/catalina.bat
@@ -21,7 +21,7 @@ rem
 rem   JAVA_HOME       Must point at your Java Development Kit installation.
 rem                   Required to run the with the "debug" argument.
 rem
-rem   JRE_HOME        Must point at your Java Development Kit installation.
+rem   JRE_HOME        Must point at your Java Runtime installation.
 rem                   Defaults to JAVA_HOME if empty.
 rem
 rem   JAVA_OPTS       (Optional) Java runtime options used when the "start",

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7b6aa06..08bdc2c 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -21,6 +21,10 @@
          <bug>42361</bug>: Handle multi-part forms when saving requests during
          FORM authentication process. Patch provided by Peter Runge. (markt)
       </fix>
+      <fix>
+         <bug>42401</bug>: Update RUNNING.txt with better JRE/JDK information.
+         (markt)
+      </fix>
     </changelog>
   </subsection>
 </section>