You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/08/22 06:56:19 UTC

[tomcat] 02/02: Fix BZ 62140 Document catalina.[sh|bat] commands

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit d8c235477807433b6b39a3e6322a91ede7fd96a3
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sun Aug 18 20:29:27 2019 +0300

    Fix BZ 62140 Document catalina.[sh|bat] commands
---
 bin/catalina.bat           | 3 +++
 bin/catalina.sh            | 3 +++
 webapps/docs/changelog.xml | 4 ++++
 3 files changed, 10 insertions(+)

diff --git a/bin/catalina.bat b/bin/catalina.bat
index 72e16b6..982b23f 100755
--- a/bin/catalina.bat
+++ b/bin/catalina.bat
@@ -17,6 +17,9 @@ rem limitations under the License.
 rem ---------------------------------------------------------------------------
 rem Start/Stop Script for the CATALINA Server
 rem
+rem For supported commands call "catalina.bat help" or see the usage section
+rem towards the end of this file.
+rem
 rem Environment Variable Prerequisites
 rem
 rem   Do not set the variables in this script. Instead put them into a script
diff --git a/bin/catalina.sh b/bin/catalina.sh
index 23bb3b3..5fbdb72 100755
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -18,6 +18,9 @@
 # -----------------------------------------------------------------------------
 # Control Script for the CATALINA Server
 #
+# For supported commands call "catalina.sh help" or see the usage section at
+# the end of this file.
+#
 # Environment Variable Prerequisites
 #
 #   Do not set the variables in this script. Instead put them into a script
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 290374d..4192ee0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -87,6 +87,10 @@
         Add Simplifed Chinese translations to the standard Tomcat distribution.
         (markt)
       </add>
+      <fix>
+        <bug>62140</bug>: Additional usage documentation in comments for
+        <code>catalina.[bat|sh]</code>. (markt)
+      </fix>
     </changelog>
   </subsection>
 </section>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org