Author: rjung
Date: Tue Jun 21 07:39:44 2011
New Revision: 1137892
URL: http://svn.apache.org/viewvc?rev=1137892&view=rev
Log:
Fix typo and more clarification about CATALINA_OPTS
vs. JAVA_OPTS.
Thanks to Rainer Frey.
Modified:
tomcat/trunk/bin/catalina.bat
tomcat/trunk/bin/catalina.sh
Modified: tomcat/trunk/bin/catalina.bat
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.bat?rev=1137892&r1=1137891&r2=1137892&view=diff
==============================================================================
--- tomcat/trunk/bin/catalina.bat (original)
+++ tomcat/trunk/bin/catalina.bat Tue Jun 21 07:39:44 2011
@@ -30,7 +30,7 @@ rem of a Catalina inst
rem the same directory that CATALINA_HOME points to.
rem
rem CATALINA_OPTS (Optional) Java runtime options used when the "start",
-rem or "run" command is executed.
+rem "run" or "debug" command is executed.
rem Include here and not in JAVA_OPTS all options, that
should
rem only be used by Tomcat itself, not by the stop process,
rem the version command etc.
@@ -47,9 +47,9 @@ rem JRE_HOME Must point at your
rem Defaults to JAVA_HOME if empty. If JRE_HOME and JAVA_HOME
rem are both set, JRE_HOME is used.
rem
-rem JAVA_OPTS (Optional) Java runtime options used when the "start",
-rem "stop", or "run" command is executed.
-rem Include here and not in CATALINA_OPTS all options, thatr
+rem JAVA_OPTS (Optional) Java runtime options used when any command
+rem is executed.
+rem Include here and not in CATALINA_OPTS all options, that
rem should be used by Tomcat and also by the stop process,
rem the version command etc.
rem Most options should go into CATALINA_OPTS.
Modified: tomcat/trunk/bin/catalina.sh
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=1137892&r1=1137891&r2=1137892&view=diff
==============================================================================
--- tomcat/trunk/bin/catalina.sh (original)
+++ tomcat/trunk/bin/catalina.sh Tue Jun 21 07:39:44 2011
@@ -34,7 +34,7 @@
# Default is $CATALINA_BASE/logs/catalina.out
#
# CATALINA_OPTS (Optional) Java runtime options used when the "start",
-# or "run" command is executed.
+# "run" or "debug" command is executed.
# Include here and not in JAVA_OPTS all options, that should
# only be used by Tomcat itself, not by the stop process,
# the version command etc.
@@ -51,9 +51,9 @@
# Defaults to JAVA_HOME if empty. If JRE_HOME and JAVA_HOME
# are both set, JRE_HOME is used.
#
-# JAVA_OPTS (Optional) Java runtime options used when the "start",
-# "stop", or "run" command is executed.
-# Include here and not in CATALINA_OPTS all options, thatr
+# JAVA_OPTS (Optional) Java runtime options used when any command
+# is executed.
+# Include here and not in CATALINA_OPTS all options, that
# should be used by Tomcat and also by the stop process,
# the version command etc.
# Most options should go into CATALINA_OPTS.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
