This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 29fd3a45b909ba2a10792f9641b50ac81c285762
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 9ba9821..cd08425 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 0d94976..f873a8f 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 56895d5..b698428 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -122,6 +122,10 @@
</subsection>
<subsection name="Other">
<changelog>
+ <fix>
+ <bug>62140</bug>: Additional usage documentation in comments for
+ <code>catalina.[bat|sh]</code>. (markt)
+ </fix>
<add>
<bug>63285</bug>: Add an option to <code>service.bat</code> so that
when
installing a Windows service, the name of the executables used by the
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
