From b0ca98210df97a9ed0c3fb5e8698f2a61c5d3113 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 14 Jul 2010 21:24:45 +0000
Subject: [PATCH] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49182
 Align setclasspath comments with reality. Based on a patch provided by sebb.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@964208 13f79535-47bb-0310-9956-ffa450edef68
---
 bin/setclasspath.bat       | 4 +++-
 bin/setclasspath.sh        | 4 +++-
 webapps/docs/changelog.xml | 4 ++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/bin/setclasspath.bat b/bin/setclasspath.bat
index c19305680..a38ae720f 100755
--- a/bin/setclasspath.bat
+++ b/bin/setclasspath.bat
@@ -15,7 +15,9 @@ rem See the License for the specific language governing permissions and
 rem limitations under the License.
 
 rem ---------------------------------------------------------------------------
-rem Set CLASSPATH and Java options
+rem Set JAVA_HOME or JRE_HOME if not already set, ensure any provided settings
+rem are valid and consistent with the selected start-up options and set up the
+rem endorsed directory. 
 rem
 rem $Id$
 rem ---------------------------------------------------------------------------
diff --git a/bin/setclasspath.sh b/bin/setclasspath.sh
index abb4544c0..a43c93586 100755
--- a/bin/setclasspath.sh
+++ b/bin/setclasspath.sh
@@ -16,7 +16,9 @@
 # limitations under the License.
 
 # -----------------------------------------------------------------------------
-#  Set CLASSPATH and Java options
+#  Set JAVA_HOME or JRE_HOME if not already set, ensure any provided settings
+#  are valid and consistent with the selected start-up options and set up the
+#  endorsed directory. 
 #
 #  $Id$
 # -----------------------------------------------------------------------------
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 82e719493..1ea0b3321 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -70,6 +70,10 @@
         one of them fails, do not ignore the others. (markt/kkolinko)
       </fix>
       <fix>
+        <bug>49182</bug>: Align comments in setclasspath.[sh|bat] with
+        behaviour. Based on a patch provided by sebb. (markt)
+      </fix>
+      <fix>
         <bug>49230</bug>: Enhance JRE leak prevention listener with protection
         for the keep-alive thread started by
         <code>sun.net.www.http.HttpClient</code>. Based on a patch provided by
-- 
2.11.0