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 be8b3f2..c8621ce 100755 (executable)
--- 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 cc9383d..0c86880 100755 (executable)
--- 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