From 8abebb325389f8644f9d60a821900b62f3e5860d Mon Sep 17 00:00:00 2001 From: rjung Date: Mon, 20 Jun 2011 09:53:37 +0000 Subject: [PATCH] Make variable explanations for catalina.bat and tool-wrapper.bat consistent with their Unix counterparts. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1137569 13f79535-47bb-0310-9956-ffa450edef68 --- bin/catalina.bat | 3 ++- bin/tool-wrapper.bat | 21 +++++++++++++++------ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/bin/catalina.bat b/bin/catalina.bat index c9d0c6d11..6c593ec24 100755 --- a/bin/catalina.bat +++ b/bin/catalina.bat @@ -37,7 +37,8 @@ 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 Runtime installation. -rem Defaults to JAVA_HOME if empty. +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. diff --git a/bin/tool-wrapper.bat b/bin/tool-wrapper.bat index ef52bfa0b..eb849db56 100755 --- a/bin/tool-wrapper.bat +++ b/bin/tool-wrapper.bat @@ -20,15 +20,24 @@ rem Wrapper script for command line tools rem rem Environment Variable Prerequisites rem -rem CATALINA_HOME May point at your Catalina "build" directory. +rem CATALINA_HOME May point at your Catalina "build" directory. rem -rem TOOL_OPTS (Optional) Java runtime options used when the "start", -rem "stop", or "run" command is executed. +rem TOOL_OPTS (Optional) Java runtime options. rem -rem JAVA_HOME Must point at your Java Development Kit installation. +rem JAVA_HOME Must point at your Java Development Kit installation. +rem Using JRE_HOME instead works as well. rem -rem JAVA_OPTS (Optional) Java runtime options used when the "start", -rem "stop", or "run" command is executed. +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. +rem +rem JAVA_ENDORSED_DIRS (Optional) Lists of of semi-colon separated directories +rem containing some jars in order to allow replacement of APIs +rem created outside of the JCP (i.e. DOM and SAX from W3C). +rem It can also be used to update the XML parser implementation. +rem Defaults to $CATALINA_HOME/endorsed. rem rem $Id$ rem --------------------------------------------------------------------------- -- 2.11.0