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:54:22 UTC
[tomcat] branch master updated (af4c20c -> 4329d12)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from af4c20c Merge pull request #193 from maxime-beck/master
new 890ca42 Simplify service usage note by substituting in current major version
new 328264a Fix BZ 62140 Document catalina.[sh|bat] commands
new 4329d12 Add release date for 9.0.24
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
bin/catalina.bat | 8 +++++---
bin/catalina.sh | 3 +++
webapps/docs/changelog.xml | 6 +++++-
3 files changed, 13 insertions(+), 4 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/03: Add release date for 9.0.24
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 4329d123ea635dc9edf22c8a1ce5b8e6e526f6e6
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Aug 22 09:53:17 2019 +0300
Add release date for 9.0.24
---
webapps/docs/changelog.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index bed01e4..bd0919c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -79,7 +79,7 @@
</changelog>
</subsection>
</section>
-<section name="Tomcat 9.0.24 (markt)" rtext="release in progress">
+<section name="Tomcat 9.0.24 (markt)" rtext="2019-08-17">
<subsection name="Coyote">
<changelog>
<scode>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/03: Fix BZ 62140 Document catalina.[sh|bat] commands
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 328264a92cdec4302dbc68ef7377eebc3ecf0c4e
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 83d093d..bed01e4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -72,6 +72,10 @@
provided with Apache Tomcat. Includes contributions by leeyazhou.
(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
[tomcat] 01/03: Simplify service usage note by substituting in
current major version
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 890ca423ef700515a3a64c3b840da9a1c4ffdea0
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sun Aug 18 20:20:50 2019 +0300
Simplify service usage note by substituting in current major version
---
bin/catalina.bat | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/bin/catalina.bat b/bin/catalina.bat
index b244418..72e16b6 100755
--- a/bin/catalina.bat
+++ b/bin/catalina.bat
@@ -28,9 +28,8 @@ rem script will have no effect at all on Windows Services. As such, any
rem local customizations made in a CATALINA_BASE/bin/setenv.bat script
rem will also have no effect on Tomcat when launched as a Windows Service.
rem The configuration that controls Windows Services is stored in the Windows
-rem Registry, and is most conveniently maintained using the "tomcatXw.exe"
-rem maintenance utility, where "X" is the major version of Tomcat you are
-rem running.
+rem Registry, and is most conveniently maintained using the "tomcat@VERSION_MAJOR@w.exe"
+rem maintenance utility.
rem
rem CATALINA_HOME May point at your Catalina "build" directory.
rem
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org