From: rjung <rjung@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 21 Jun 2011 06:17:38 +0000 (+0000)
Subject: Add an info about setenv.sh before listing the
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=ea3fe1060b150b88e1bf005012afe3451e8fe85d;p=tomcat7.0

Add an info about setenv.sh before listing the
customizable variables.


git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1137868 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/bin/catalina.bat b/bin/catalina.bat
index be8b3f2c6..c8621cedc 100755
--- a/bin/catalina.bat
+++ b/bin/catalina.bat
@@ -20,6 +20,9 @@ rem Start/Stop Script for the CATALINA Server
 rem
 rem Environment Variable Prerequisites
 rem
+rem   Do not set the variables in this script. Instead put them into a script
+rem   setenv.bat in CATALINA_BASE/bin to keep your customizations separate.
+rem
 rem   CATALINA_HOME   May point at your Catalina "build" directory.
 rem
 rem   CATALINA_BASE   (Optional) Base directory for resolving dynamic portions
diff --git a/bin/catalina.sh b/bin/catalina.sh
index cc9383da8..0c86880b7 100755
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -20,6 +20,9 @@
 #
 # Environment Variable Prerequisites
 #
+#   Do not set the variables in this script. Instead put them into a script
+#   setenv.sh in CATALINA_BASE/bin to keep your customizations separate.
+#
 #   CATALINA_HOME   May point at your Catalina "build" directory.
 #
 #   CATALINA_BASE   (Optional) Base directory for resolving dynamic portions