Author: rjung Date: Mon Jun 20 09:53:37 2011 New Revision: 1137569 URL: http://svn.apache.org/viewvc?rev=1137569&view=rev Log: Make variable explanations for catalina.bat and tool-wrapper.bat consistent with their Unix counterparts.
Modified: tomcat/trunk/bin/catalina.bat tomcat/trunk/bin/tool-wrapper.bat Modified: tomcat/trunk/bin/catalina.bat URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.bat?rev=1137569&r1=1137568&r2=1137569&view=diff ============================================================================== --- tomcat/trunk/bin/catalina.bat (original) +++ tomcat/trunk/bin/catalina.bat Mon Jun 20 09:53:37 2011 @@ -37,7 +37,8 @@ rem JAVA_HOME Must point at your 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. Modified: tomcat/trunk/bin/tool-wrapper.bat URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/tool-wrapper.bat?rev=1137569&r1=1137568&r2=1137569&view=diff ============================================================================== --- tomcat/trunk/bin/tool-wrapper.bat (original) +++ tomcat/trunk/bin/tool-wrapper.bat Mon Jun 20 09:53:37 2011 @@ -20,15 +20,24 @@ rem Wrapper script for command line tool 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 --------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org