From 90c1839b80aaaf407ad7df4549db2ca1140d7cc8 Mon Sep 17 00:00:00 2001 From: rjung Date: Tue, 21 Jun 2011 07:39:44 +0000 Subject: [PATCH] Fix typo and more clarification about CATALINA_OPTS vs. JAVA_OPTS. Thanks to Rainer Frey. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1137892 13f79535-47bb-0310-9956-ffa450edef68 --- bin/catalina.bat | 8 ++++---- bin/catalina.sh | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bin/catalina.bat b/bin/catalina.bat index c8621cedc..de68f534b 100755 --- a/bin/catalina.bat +++ b/bin/catalina.bat @@ -30,7 +30,7 @@ rem of a Catalina installation. If not present, resolves to 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 Java Runtime installation. 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. diff --git a/bin/catalina.sh b/bin/catalina.sh index 0c86880b7..a15f4c5cd 100755 --- a/bin/catalina.sh +++ b/bin/catalina.sh @@ -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. -- 2.11.0