svn commit: r1914975 - in /tomcat/site/trunk: docs/ xdocs/stylesheets/

2023-12-29 Thread markt 
Author: markt
Date: Fri Dec 29 10:28:58 2023
New Revision: 1914975

URL: http://svn.apache.org/viewvc?rev=1914975&view=rev
Log:
List Tomcat logo first. Use more general term for ASF logo

Modified:
tomcat/site/trunk/docs/bugreport.html
tomcat/site/trunk/docs/ci.html
tomcat/site/trunk/docs/conference.html
tomcat/site/trunk/docs/contact.html
tomcat/site/trunk/docs/download-10.html
tomcat/site/trunk/docs/download-11.html
tomcat/site/trunk/docs/download-80.html
tomcat/site/trunk/docs/download-90.html
tomcat/site/trunk/docs/download-connectors.html
tomcat/site/trunk/docs/download-migration.html
tomcat/site/trunk/docs/download-native.html
tomcat/site/trunk/docs/download-taglibs.html
tomcat/site/trunk/docs/findhelp.html
tomcat/site/trunk/docs/getinvolved.html
tomcat/site/trunk/docs/heritage.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/irc.html
tomcat/site/trunk/docs/legal.html
tomcat/site/trunk/docs/lists.html
tomcat/site/trunk/docs/maven-plugin.html
tomcat/site/trunk/docs/migration-10.1.html
tomcat/site/trunk/docs/migration-10.html
tomcat/site/trunk/docs/migration-11.0.html
tomcat/site/trunk/docs/migration-6.html
tomcat/site/trunk/docs/migration-7.html
tomcat/site/trunk/docs/migration-8.html
tomcat/site/trunk/docs/migration-85.html
tomcat/site/trunk/docs/migration-9.html
tomcat/site/trunk/docs/migration.html
tomcat/site/trunk/docs/oldnews-2010.html
tomcat/site/trunk/docs/oldnews-2011.html
tomcat/site/trunk/docs/oldnews-2012.html
tomcat/site/trunk/docs/oldnews-2013.html
tomcat/site/trunk/docs/oldnews-2014.html
tomcat/site/trunk/docs/oldnews-2015.html
tomcat/site/trunk/docs/oldnews-2016.html
tomcat/site/trunk/docs/oldnews-2017.html
tomcat/site/trunk/docs/oldnews-2018.html
tomcat/site/trunk/docs/oldnews-2019.html
tomcat/site/trunk/docs/oldnews-2020.html
tomcat/site/trunk/docs/oldnews-2021.html
tomcat/site/trunk/docs/oldnews-2022.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/presentations.html
tomcat/site/trunk/docs/resources.html
tomcat/site/trunk/docs/security-10.html
tomcat/site/trunk/docs/security-11.html
tomcat/site/trunk/docs/security-3.html
tomcat/site/trunk/docs/security-4.html
tomcat/site/trunk/docs/security-5.html
tomcat/site/trunk/docs/security-6.html
tomcat/site/trunk/docs/security-7.html
tomcat/site/trunk/docs/security-8.html
tomcat/site/trunk/docs/security-9.html
tomcat/site/trunk/docs/security-impact.html
tomcat/site/trunk/docs/security-jk.html
tomcat/site/trunk/docs/security-native.html
tomcat/site/trunk/docs/security-taglibs.html
tomcat/site/trunk/docs/security.html
tomcat/site/trunk/docs/source.html
tomcat/site/trunk/docs/taglibs.html
tomcat/site/trunk/docs/tomcat-10.0-eol.html
tomcat/site/trunk/docs/tomcat-55-eol.html
tomcat/site/trunk/docs/tomcat-60-eol.html
tomcat/site/trunk/docs/tomcat-70-eol.html
tomcat/site/trunk/docs/tomcat-80-eol.html
tomcat/site/trunk/docs/tomcat-85-eol.html
tomcat/site/trunk/docs/tools.html
tomcat/site/trunk/docs/upgrading.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/docs/whoweare.html
tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl

Modified: tomcat/site/trunk/docs/bugreport.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==
--- tomcat/site/trunk/docs/bugreport.html (original)
+++ tomcat/site/trunk/docs/bugreport.html Fri Dec 29 10:28:58 2023
@@ -452,7 +452,7 @@ See Security Rep
 
 Copyright © 1999-2023, The Apache Software Foundation
 
-Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
-project logo are either registered trademarks or trademarks of the Apache
-Software Foundation.
+Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the Apache logo
+are either registered trademarks or trademarks of the Apache Software
+Foundation.
   
\ No newline at end of file

Modified: tomcat/site/trunk/docs/ci.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==
--- tomcat/site/trunk/docs/ci.html (original)
+++ tomcat/site/trunk/docs/ci.html Fri Dec 29 10:28:58 2023
@@ -313,7 +313,7 @@ for not-yet-released versions of Apache
 
 Copyright © 1999-2023, The Apache Software Foundation
 
-Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
-project logo are either registered trademarks or trademarks of the Apache
-Software Foundation.
+Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the Apache logo
+are either registered trademarks or trademark

(tomcat) branch main updated: Include trademark attribution in docs footer

2023-12-29 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new cea71080d8 Include trademark attribution in docs footer
cea71080d8 is described below

commit cea71080d87e46b1a39ef2a6bf47e11c22135881
Author: Mark Thomas 
AuthorDate: Fri Dec 29 10:29:48 2023 +

Include trademark attribution in docs footer
---
 webapps/docs/tomcat-docs.xsl | 4 
 1 file changed, 4 insertions(+)

diff --git a/webapps/docs/tomcat-docs.xsl b/webapps/docs/tomcat-docs.xsl
index f927e4fc4a..d19e9167a4 100644
--- a/webapps/docs/tomcat-docs.xsl
+++ b/webapps/docs/tomcat-docs.xsl
@@ -151,6 +151,10 @@
   
 
 Copyright © 1999-, The Apache Software 
Foundation
+
+Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the Apache logo
+are either registered trademarks or trademarks of the Apache Software
+Foundation.
 
   
   


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

(tomcat) branch 10.1.x updated: Include trademark attribution in docs footer

2023-12-29 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 2b6b55a0a5 Include trademark attribution in docs footer
2b6b55a0a5 is described below

commit 2b6b55a0a5a2a46c281871adc486f618249704e2
Author: Mark Thomas 
AuthorDate: Fri Dec 29 10:29:48 2023 +

Include trademark attribution in docs footer
---
 webapps/docs/tomcat-docs.xsl | 4 
 1 file changed, 4 insertions(+)

diff --git a/webapps/docs/tomcat-docs.xsl b/webapps/docs/tomcat-docs.xsl
index 958872d6c4..7c7fde1116 100644
--- a/webapps/docs/tomcat-docs.xsl
+++ b/webapps/docs/tomcat-docs.xsl
@@ -151,6 +151,10 @@
   
 
 Copyright © 1999-, The Apache Software 
Foundation
+
+Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the Apache logo
+are either registered trademarks or trademarks of the Apache Software
+Foundation.
 
   
   


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

(tomcat) branch 9.0.x updated: Include trademark attribution in docs footer

2023-12-29 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new a4562bef68 Include trademark attribution in docs footer
a4562bef68 is described below

commit a4562bef68854d810926bcb7c5c2d6763087a49e
Author: Mark Thomas 
AuthorDate: Fri Dec 29 10:29:48 2023 +

Include trademark attribution in docs footer
---
 webapps/docs/tomcat-docs.xsl | 4 
 1 file changed, 4 insertions(+)

diff --git a/webapps/docs/tomcat-docs.xsl b/webapps/docs/tomcat-docs.xsl
index 16071f52e8..b10a8c02e6 100644
--- a/webapps/docs/tomcat-docs.xsl
+++ b/webapps/docs/tomcat-docs.xsl
@@ -151,6 +151,10 @@
   
 
 Copyright © 1999-, The Apache Software 
Foundation
+
+Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the Apache logo
+are either registered trademarks or trademarks of the Apache Software
+Foundation.
 
   
   


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

(tomcat) branch 8.5.x updated: Include trademark attribution in docs footer

2023-12-29 Thread markt 
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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new af08e8cdf5 Include trademark attribution in docs footer
af08e8cdf5 is described below

commit af08e8cdf51c643e0a60b42a6d3405ab00d071df
Author: Mark Thomas 
AuthorDate: Fri Dec 29 10:29:48 2023 +

Include trademark attribution in docs footer
---
 webapps/docs/tomcat-docs.xsl | 4 
 1 file changed, 4 insertions(+)

diff --git a/webapps/docs/tomcat-docs.xsl b/webapps/docs/tomcat-docs.xsl
index 368dc65da0..500bf8c041 100644
--- a/webapps/docs/tomcat-docs.xsl
+++ b/webapps/docs/tomcat-docs.xsl
@@ -151,6 +151,10 @@
   
 
 Copyright © 1999-, The Apache Software 
Foundation
+
+Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the Apache logo
+are either registered trademarks or trademarks of the Apache Software
+Foundation.
 
   
   


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

(tomcat) branch main updated: Trademark improvements

2023-12-29 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new 870398358c Trademark improvements
870398358c is described below

commit 870398358c9f168a3fbc6f05c20e0e91cfb96380
Author: Mark Thomas 
AuthorDate: Fri Dec 29 10:52:38 2023 +

Trademark improvements

- Add ® after Tomcat in titles of Javadoc output
- Add standard trademark attribution to Javadoc footer
---
 build.xml | 63 ++-
 1 file changed, 42 insertions(+), 21 deletions(-)

diff --git a/build.xml b/build.xml
index 3a9e9dcb16..c985b9bb5e 100644
--- a/build.xml
+++ b/build.xml
@@ -2209,9 +2209,12 @@
   destdir="${tomcat.dist}/webapps/docs/annotationapi"
   version="true"
   windowtitle="Common Annotations ${annotation.spec.version} API 
Documentation - Apache Tomcat ${version}"
-  doctitle="Common Annotations ${annotation.spec.version} API - Apache 
Tomcat ${version}"
-  header="Common Annotations ${annotation.spec.version} - Apache 
Tomcat ${version}"
-  bottom="Copyright © 2000-${year} Apache Software Foundation. 
All Rights Reserved."
+  doctitle="Common Annotations ${annotation.spec.version} API - Apache 
Tomcat® ${version}"
+  header="Common Annotations ${annotation.spec.version} - Apache 
Tomcat® ${version}"
+  bottom="Copyright © 2000-${year} Apache Software Foundation.
+  

+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
   charset="UTF-8"
@@ -2231,9 +2234,12 @@
   destdir="${tomcat.dist}/webapps/docs/servletapi"
   version="true"
   windowtitle="Servlet ${servlet.spec.version} API Documentation - Apache 
Tomcat ${version}"
-  doctitle="Servlet ${servlet.spec.version} API - Apache Tomcat ${version}"
-  header="Servlet ${servlet.spec.version} - Apache Tomcat 
${version}"
-  bottom="Copyright © 2000-${year} Apache Software Foundation. 
All Rights Reserved."
+  doctitle="Servlet ${servlet.spec.version} API - Apache 
Tomcat® ${version}"
+  header="Servlet ${servlet.spec.version} - Apache 
Tomcat® ${version}"
+  bottom="Copyright © 2000-${year} Apache Software Foundation.
+  

+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
   charset="UTF-8"
@@ -2252,9 +2258,12 @@
   destdir="${tomcat.dist}/webapps/docs/jspapi"
   version="true"
   windowtitle="JSP ${jsp.spec.version} API Documentation - Apache Tomcat 
${version}"
-  doctitle="JSP ${jsp.spec.version} API - Apache Tomcat ${version}"
-  header="JSP ${jsp.spec.version} - Apache Tomcat 
${version}"
-  bottom="Copyright © 2000-${year} Apache Software Foundation. 
All Rights Reserved."
+  doctitle="JSP ${jsp.spec.version} API - Apache 
Tomcat® ${version}"
+  header="JSP ${jsp.spec.version} - Apache 
Tomcat® ${version}"
+  bottom="Copyright © 2000-${year} Apache Software Foundation.
+  

+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
   charset="UTF-8"
@@ -2273,9 +2282,12 @@
   destdir="${tomcat.dist}/webapps/docs/elapi"
   version="true"
   windowtitle="EL ${el.spec.version} API Documentation - Apache Tomcat 
${version}"
-  doctitle="EL ${el.spec.version} API - Apache Tomcat ${version}"
-  header="EL ${el.spec.version} - Apache Tomcat 
${version}"
-  bottom="Copyright © 2000-${year} Apache Software Foundation. 
All Rights Reserved."
+  doctitle="EL ${el.spec.version} API - Apache 
Tomcat® ${version}"
+  header="EL ${el.spec.version} - Apache 
Tomcat® ${version}"
+  bottom="Copyright © 2000-${year} Apache Software Foundation.
+  

+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
   charset="UTF-8"
@@ -2294,9 +2306,12 @@
   destdir="${tomcat.dist}/webapps/docs/websocketapi"
   version="true"
   windowtitle="WebSocket ${websocket.spec.version} API Documentation - 
Apache Tomcat

(tomcat) branch 10.1.x updated: Trademark improvements

2023-12-29 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new c861a98e79 Trademark improvements
c861a98e79 is described below

commit c861a98e799c06ec5002f9a236b6a9a517419d6f
Author: Mark Thomas 
AuthorDate: Fri Dec 29 10:52:38 2023 +

Trademark improvements

- Add ® after Tomcat in titles of Javadoc output
- Add standard trademark attribution to Javadoc footer
---
 build.xml | 63 ++-
 1 file changed, 42 insertions(+), 21 deletions(-)

diff --git a/build.xml b/build.xml
index 12b69e4e93..98289342fe 100644
--- a/build.xml
+++ b/build.xml
@@ -2243,9 +2243,12 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   destdir="${tomcat.dist}/webapps/docs/annotationapi"
   version="true"
   windowtitle="Common Annotations ${annotation.spec.version} API 
Documentation - Apache Tomcat ${version}"
-  doctitle="Common Annotations ${annotation.spec.version} API - Apache 
Tomcat ${version}"
-  header="Common Annotations ${annotation.spec.version} - Apache 
Tomcat ${version}"
-  bottom="Copyright © 2000-${year} Apache Software Foundation. 
All Rights Reserved."
+  doctitle="Common Annotations ${annotation.spec.version} API - Apache 
Tomcat® ${version}"
+  header="Common Annotations ${annotation.spec.version} - Apache 
Tomcat® ${version}"
+  bottom="Copyright © 2000-${year} Apache Software Foundation.
+  

+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
   charset="UTF-8"
@@ -2265,9 +2268,12 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   destdir="${tomcat.dist}/webapps/docs/servletapi"
   version="true"
   windowtitle="Servlet ${servlet.spec.version} API Documentation - Apache 
Tomcat ${version}"
-  doctitle="Servlet ${servlet.spec.version} API - Apache Tomcat ${version}"
-  header="Servlet ${servlet.spec.version} - Apache Tomcat 
${version}"
-  bottom="Copyright © 2000-${year} Apache Software Foundation. 
All Rights Reserved."
+  doctitle="Servlet ${servlet.spec.version} API - Apache 
Tomcat® ${version}"
+  header="Servlet ${servlet.spec.version} - Apache 
Tomcat® ${version}"
+  bottom="Copyright © 2000-${year} Apache Software Foundation.
+  

+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
   charset="UTF-8"
@@ -2286,9 +2292,12 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   destdir="${tomcat.dist}/webapps/docs/jspapi"
   version="true"
   windowtitle="JSP ${jsp.spec.version} API Documentation - Apache Tomcat 
${version}"
-  doctitle="JSP ${jsp.spec.version} API - Apache Tomcat ${version}"
-  header="JSP ${jsp.spec.version} - Apache Tomcat 
${version}"
-  bottom="Copyright © 2000-${year} Apache Software Foundation. 
All Rights Reserved."
+  doctitle="JSP ${jsp.spec.version} API - Apache 
Tomcat® ${version}"
+  header="JSP ${jsp.spec.version} - Apache 
Tomcat® ${version}"
+  bottom="Copyright © 2000-${year} Apache Software Foundation.
+  

+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
   charset="UTF-8"
@@ -2307,9 +2316,12 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   destdir="${tomcat.dist}/webapps/docs/elapi"
   version="true"
   windowtitle="EL ${el.spec.version} API Documentation - Apache Tomcat 
${version}"
-  doctitle="EL ${el.spec.version} API - Apache Tomcat ${version}"
-  header="EL ${el.spec.version} - Apache Tomcat 
${version}"
-  bottom="Copyright © 2000-${year} Apache Software Foundation. 
All Rights Reserved."
+  doctitle="EL ${el.spec.version} API - Apache 
Tomcat® ${version}"
+  header="EL ${el.spec.version} - Apache 
Tomcat® ${version}"
+  bottom="Copyright © 2000-${year} Apache Software Foundation.
+  

+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  or trademarks of

(tomcat) branch 9.0.x updated: Trademark improvements

2023-12-29 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 78b18f11d6 Trademark improvements
78b18f11d6 is described below

commit 78b18f11d60f192d8e61f93d7d25f415e64d67ce
Author: Mark Thomas 
AuthorDate: Fri Dec 29 10:52:38 2023 +

Trademark improvements

- Add ® after Tomcat in titles of Javadoc output
- Add standard trademark attribution to Javadoc footer
---
 build.xml | 63 ++-
 1 file changed, 42 insertions(+), 21 deletions(-)

diff --git a/build.xml b/build.xml
index 36decb0cfa..0f8968eefe 100644
--- a/build.xml
+++ b/build.xml
@@ -2188,9 +2188,12 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   destdir="${tomcat.dist}/webapps/docs/annotationapi"
   version="true"
   windowtitle="Common Annotations ${annotation.spec.version} API 
Documentation - Apache Tomcat ${version}"
-  doctitle="Common Annotations ${annotation.spec.version} API - Apache 
Tomcat ${version}"
-  header="Common Annotations ${annotation.spec.version} - Apache 
Tomcat ${version}"
-  bottom="Copyright © 2000-${year} Apache Software Foundation. 
All Rights Reserved."
+  doctitle="Common Annotations ${annotation.spec.version} API - Apache 
Tomcat® ${version}"
+  header="Common Annotations ${annotation.spec.version} - Apache 
Tomcat® ${version}"
+  bottom="Copyright © 2000-${year} Apache Software Foundation.
+  

+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
   charset="UTF-8"
@@ -2210,9 +2213,12 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   destdir="${tomcat.dist}/webapps/docs/servletapi"
   version="true"
   windowtitle="Servlet ${servlet.spec.version} API Documentation - Apache 
Tomcat ${version}"
-  doctitle="Servlet ${servlet.spec.version} API - Apache Tomcat ${version}"
-  header="Servlet ${servlet.spec.version} - Apache Tomcat 
${version}"
-  bottom="Copyright © 2000-${year} Apache Software Foundation. 
All Rights Reserved."
+  doctitle="Servlet ${servlet.spec.version} API - Apache 
Tomcat® ${version}"
+  header="Servlet ${servlet.spec.version} - Apache 
Tomcat® ${version}"
+  bottom="Copyright © 2000-${year} Apache Software Foundation.
+  

+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
   charset="UTF-8"
@@ -2231,9 +2237,12 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   destdir="${tomcat.dist}/webapps/docs/jspapi"
   version="true"
   windowtitle="JSP ${jsp.spec.version} API Documentation - Apache Tomcat 
${version}"
-  doctitle="JSP ${jsp.spec.version} API - Apache Tomcat ${version}"
-  header="JSP ${jsp.spec.version} - Apache Tomcat 
${version}"
-  bottom="Copyright © 2000-${year} Apache Software Foundation. 
All Rights Reserved."
+  doctitle="JSP ${jsp.spec.version} API - Apache 
Tomcat® ${version}"
+  header="JSP ${jsp.spec.version} - Apache 
Tomcat® ${version}"
+  bottom="Copyright © 2000-${year} Apache Software Foundation.
+  

+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
   charset="UTF-8"
@@ -2252,9 +2261,12 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   destdir="${tomcat.dist}/webapps/docs/elapi"
   version="true"
   windowtitle="EL ${el.spec.version} API Documentation - Apache Tomcat 
${version}"
-  doctitle="EL ${el.spec.version} API - Apache Tomcat ${version}"
-  header="EL ${el.spec.version} - Apache Tomcat 
${version}"
-  bottom="Copyright © 2000-${year} Apache Software Foundation. 
All Rights Reserved."
+  doctitle="EL ${el.spec.version} API - Apache 
Tomcat® ${version}"
+  header="EL ${el.spec.version} - Apache 
Tomcat® ${version}"
+  bottom="Copyright © 2000-${year} Apache Software Foundation.
+  

+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  or trademarks of th

(tomcat) branch 8.5.x updated: Trademark improvements

2023-12-29 Thread markt 
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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 2678e745b9 Trademark improvements
2678e745b9 is described below

commit 2678e745b90bdeca5a903f17deb99f2e2c63858a
Author: Mark Thomas 
AuthorDate: Fri Dec 29 10:52:38 2023 +

Trademark improvements

- Add ® after Tomcat in titles of Javadoc output
- Add standard trademark attribution to Javadoc footer
---
 build.xml | 63 ++-
 1 file changed, 42 insertions(+), 21 deletions(-)

diff --git a/build.xml b/build.xml
index a1611fbbcd..1290ec40a3 100644
--- a/build.xml
+++ b/build.xml
@@ -1886,9 +1886,12 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   destdir="${tomcat.dist}/webapps/docs/annotationapi"
   version="true"
   windowtitle="Common Annotations ${annotation.spec.version} API 
Documentation - Apache Tomcat ${version}"
-  doctitle="Common Annotations ${annotation.spec.version} API - Apache 
Tomcat ${version}"
-  header="Common Annotations ${annotation.spec.version} - Apache 
Tomcat ${version}"
-  bottom="Copyright © 2000-${year} Apache Software Foundation. 
All Rights Reserved."
+  doctitle="Common Annotations ${annotation.spec.version} API - Apache 
Tomcat® ${version}"
+  header="Common Annotations ${annotation.spec.version} - Apache 
Tomcat® ${version}"
+  bottom="Copyright © 2000-${year} Apache Software Foundation.
+  

+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
   charset="UTF-8"
@@ -1908,9 +1911,12 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   destdir="${tomcat.dist}/webapps/docs/servletapi"
   version="true"
   windowtitle="Servlet ${servlet.spec.version} API Documentation - Apache 
Tomcat ${version}"
-  doctitle="Servlet ${servlet.spec.version} API - Apache Tomcat ${version}"
-  header="Servlet ${servlet.spec.version} - Apache Tomcat 
${version}"
-  bottom="Copyright © 2000-${year} Apache Software Foundation. 
All Rights Reserved."
+  doctitle="Servlet ${servlet.spec.version} API - Apache 
Tomcat® ${version}"
+  header="Servlet ${servlet.spec.version} - Apache 
Tomcat® ${version}"
+  bottom="Copyright © 2000-${year} Apache Software Foundation.
+  

+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
   charset="UTF-8"
@@ -1930,9 +1936,12 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   destdir="${tomcat.dist}/webapps/docs/jspapi"
   version="true"
   windowtitle="JSP ${jsp.spec.version} API Documentation - Apache Tomcat 
${version}"
-  doctitle="JSP ${jsp.spec.version} API - Apache Tomcat ${version}"
-  header="JSP ${jsp.spec.version} - Apache Tomcat 
${version}"
-  bottom="Copyright © 2000-${year} Apache Software Foundation. 
All Rights Reserved."
+  doctitle="JSP ${jsp.spec.version} API - Apache 
Tomcat® ${version}"
+  header="JSP ${jsp.spec.version} - Apache 
Tomcat® ${version}"
+  bottom="Copyright © 2000-${year} Apache Software Foundation.
+  

+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
   charset="UTF-8"
@@ -1952,9 +1961,12 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   destdir="${tomcat.dist}/webapps/docs/elapi"
   version="true"
   windowtitle="EL ${el.spec.version} API Documentation - Apache Tomcat 
${version}"
-  doctitle="EL ${el.spec.version} API - Apache Tomcat ${version}"
-  header="EL ${el.spec.version} - Apache Tomcat 
${version}"
-  bottom="Copyright © 2000-${year} Apache Software Foundation. 
All Rights Reserved."
+  doctitle="EL ${el.spec.version} API - Apache 
Tomcat® ${version}"
+  header="EL ${el.spec.version} - Apache 
Tomcat® ${version}"
+  bottom="Copyright © 2000-${year} Apache Software Foundation.
+  

+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  or trademarks of th

(tomcat) branch main updated: Remove unused parameters

2023-12-29 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new 84bd34e0b9 Remove unused parameters
84bd34e0b9 is described below

commit 84bd34e0b9a983a9b2cf8bbd739f808310f9bd6c
Author: Mark Thomas 
AuthorDate: Fri Dec 29 10:59:47 2023 +

Remove unused parameters
---
 webapps/docs/tomcat-docs.xsl | 2 --
 1 file changed, 2 deletions(-)

diff --git a/webapps/docs/tomcat-docs.xsl b/webapps/docs/tomcat-docs.xsl
index d19e9167a4..d152384e45 100644
--- a/webapps/docs/tomcat-docs.xsl
+++ b/webapps/docs/tomcat-docs.xsl
@@ -28,8 +28,6 @@
   doctype-system="about:legacy-compat"/>
 
   
-  
-  https://tomcat.apache.org/'"/>
   
   
   


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

(tomcat) branch 10.1.x updated: Remove unused parameters

2023-12-29 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 25a7271f5d Remove unused parameters
25a7271f5d is described below

commit 25a7271f5d87516f34cc8dae8322bcf57d3bc548
Author: Mark Thomas 
AuthorDate: Fri Dec 29 10:59:47 2023 +

Remove unused parameters
---
 webapps/docs/tomcat-docs.xsl | 2 --
 1 file changed, 2 deletions(-)

diff --git a/webapps/docs/tomcat-docs.xsl b/webapps/docs/tomcat-docs.xsl
index 7c7fde1116..dcdf8af21e 100644
--- a/webapps/docs/tomcat-docs.xsl
+++ b/webapps/docs/tomcat-docs.xsl
@@ -28,8 +28,6 @@
   doctype-system="about:legacy-compat"/>
 
   
-  
-  https://tomcat.apache.org/'"/>
   
   
   


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

(tomcat) branch 9.0.x updated: Remove unused parameters

2023-12-29 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 3a01aca730 Remove unused parameters
3a01aca730 is described below

commit 3a01aca7305ab47ade7afa37b69869587d786d70
Author: Mark Thomas 
AuthorDate: Fri Dec 29 10:59:47 2023 +

Remove unused parameters
---
 webapps/docs/tomcat-docs.xsl | 2 --
 1 file changed, 2 deletions(-)

diff --git a/webapps/docs/tomcat-docs.xsl b/webapps/docs/tomcat-docs.xsl
index b10a8c02e6..df2738dbb2 100644
--- a/webapps/docs/tomcat-docs.xsl
+++ b/webapps/docs/tomcat-docs.xsl
@@ -28,8 +28,6 @@
   doctype-system="about:legacy-compat"/>
 
   
-  
-  https://tomcat.apache.org/'"/>
   
   
   


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

(tomcat) branch 8.5.x updated: Remove unused parameters

2023-12-29 Thread markt 
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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 386106a0eb Remove unused parameters
386106a0eb is described below

commit 386106a0eb56c0389140d9f7d870f10bc06c7583
Author: Mark Thomas 
AuthorDate: Fri Dec 29 10:59:47 2023 +

Remove unused parameters
---
 webapps/docs/tomcat-docs.xsl | 2 --
 1 file changed, 2 deletions(-)

diff --git a/webapps/docs/tomcat-docs.xsl b/webapps/docs/tomcat-docs.xsl
index 500bf8c041..0cc02047d6 100644
--- a/webapps/docs/tomcat-docs.xsl
+++ b/webapps/docs/tomcat-docs.xsl
@@ -28,8 +28,6 @@
   doctype-system="about:legacy-compat"/>
 
   
-  
-  https://tomcat.apache.org/'"/>
   
   
   


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

(tomcat-native) branch main updated: Remove unused parameters

2023-12-29 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git


The following commit(s) were added to refs/heads/main by this push:
 new d59e74e03 Remove unused parameters
d59e74e03 is described below

commit d59e74e039bc973361462d5d645dcc7113ee81c9
Author: Mark Thomas 
AuthorDate: Fri Dec 29 11:03:44 2023 +

Remove unused parameters
---
 xdocs/style.xsl | 2 --
 1 file changed, 2 deletions(-)

diff --git a/xdocs/style.xsl b/xdocs/style.xsl
index dfc75dd74..e14542572 100644
--- a/xdocs/style.xsl
+++ b/xdocs/style.xsl
@@ -30,8 +30,6 @@
 
 
   
-  
-  http://tomcat.apache.org/'"/>
   
   
   


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

Buildbot failure in on tomcat-10.1.x

2023-12-29 Thread buildbot 
Build status: BUILD FAILED: failed compile (failure)
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/44/builds/1076
Blamelist: Mark Thomas 
Build Text: failed compile (failure)
Status Detected: new failure
Build Source Stamp: [branch 10.1.x] 25a7271f5d87516f34cc8dae8322bcf57d3bc548


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  compile: 1

  shell_6: 0

  shell_7: 0

  shell_8: 0

  shell_9: 0

  Rsync docs to nightlies.apache.org: 0

  shell_10: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 2

  shell_11: 0

  Rsync Logs to nightlies.apache.org: 0


-- ASF Buildbot


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

(tomcat) branch main updated: Remove trailing spaces

2023-12-29 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new 7bdece55a3 Remove trailing spaces
7bdece55a3 is described below

commit 7bdece55a30dac81c3f094f51ce29142dd62579e
Author: Mark Thomas 
AuthorDate: Fri Dec 29 17:50:12 2023 +

Remove trailing spaces
---
 build.xml | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.xml b/build.xml
index c985b9bb5e..217f407067 100644
--- a/build.xml
+++ b/build.xml
@@ -2213,7 +2213,7 @@
   header="Common Annotations ${annotation.spec.version} - Apache 
Tomcat® ${version}"
   bottom="Copyright © 2000-${year} Apache Software Foundation.
   

-  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks
   or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
@@ -2238,7 +2238,7 @@
   header="Servlet ${servlet.spec.version} - Apache 
Tomcat® ${version}"
   bottom="Copyright © 2000-${year} Apache Software Foundation.
   

-  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks
   or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
@@ -2262,7 +2262,7 @@
   header="JSP ${jsp.spec.version} - Apache 
Tomcat® ${version}"
   bottom="Copyright © 2000-${year} Apache Software Foundation.
   

-  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks
   or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
@@ -2286,7 +2286,7 @@
   header="EL ${el.spec.version} - Apache 
Tomcat® ${version}"
   bottom="Copyright © 2000-${year} Apache Software Foundation.
   

-  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks
   or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
@@ -2310,7 +2310,7 @@
   header="WebSocket ${websocket.spec.version} - Apache 
Tomcat® ${version}"
   bottom="Copyright © 2000-${year} Apache Software Foundation.
   

-  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks
   or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
@@ -2334,7 +2334,7 @@
   header="JASPIC ${jaspic.spec.version} - Apache 
Tomcat® ${version}"
   bottom="Copyright © 2000-${year} Apache Software Foundation.
   

-  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks
   or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
@@ -2356,7 +2356,7 @@
   header="Apache Tomcat® 
${version}"
   bottom="Copyright © 2000-${year} Apache Software Foundation.
   

-  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks
   or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"


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

(tomcat) branch 10.1.x updated: Remove trailing spaces

2023-12-29 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 48d9cbaf07 Remove trailing spaces
48d9cbaf07 is described below

commit 48d9cbaf07622234a29e20a821d50bc5e8fcd435
Author: Mark Thomas 
AuthorDate: Fri Dec 29 17:50:12 2023 +

Remove trailing spaces
---
 build.xml | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.xml b/build.xml
index 98289342fe..851a60b77c 100644
--- a/build.xml
+++ b/build.xml
@@ -2247,7 +2247,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   header="Common Annotations ${annotation.spec.version} - Apache 
Tomcat® ${version}"
   bottom="Copyright © 2000-${year} Apache Software Foundation.
   

-  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks
   or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
@@ -2272,7 +2272,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   header="Servlet ${servlet.spec.version} - Apache 
Tomcat® ${version}"
   bottom="Copyright © 2000-${year} Apache Software Foundation.
   

-  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks
   or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
@@ -2296,7 +2296,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   header="JSP ${jsp.spec.version} - Apache 
Tomcat® ${version}"
   bottom="Copyright © 2000-${year} Apache Software Foundation.
   

-  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks
   or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
@@ -2320,7 +2320,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   header="EL ${el.spec.version} - Apache 
Tomcat® ${version}"
   bottom="Copyright © 2000-${year} Apache Software Foundation.
   

-  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks
   or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
@@ -2344,7 +2344,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   header="WebSocket ${websocket.spec.version} - Apache 
Tomcat® ${version}"
   bottom="Copyright © 2000-${year} Apache Software Foundation.
   

-  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks
   or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
@@ -2368,7 +2368,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   header="JASPIC ${jaspic.spec.version} - Apache 
Tomcat® ${version}"
   bottom="Copyright © 2000-${year} Apache Software Foundation.
   

-  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks
   or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
@@ -2390,7 +2390,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   header="Apache Tomcat® 
${version}"
   bottom="Copyright © 2000-${year} Apache Software Foundation.
   

-  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are e

(tomcat) branch 9.0.x updated: Remove trailing spaces

2023-12-29 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new c0e9e1e745 Remove trailing spaces
c0e9e1e745 is described below

commit c0e9e1e745e0cadf8f115404d55729c1b711e471
Author: Mark Thomas 
AuthorDate: Fri Dec 29 17:50:12 2023 +

Remove trailing spaces
---
 build.xml | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.xml b/build.xml
index 0f8968eefe..adbd7a28bc 100644
--- a/build.xml
+++ b/build.xml
@@ -2192,7 +2192,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   header="Common Annotations ${annotation.spec.version} - Apache 
Tomcat® ${version}"
   bottom="Copyright © 2000-${year} Apache Software Foundation.
   

-  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks
   or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
@@ -2217,7 +2217,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   header="Servlet ${servlet.spec.version} - Apache 
Tomcat® ${version}"
   bottom="Copyright © 2000-${year} Apache Software Foundation.
   

-  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks
   or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
@@ -2241,7 +2241,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   header="JSP ${jsp.spec.version} - Apache 
Tomcat® ${version}"
   bottom="Copyright © 2000-${year} Apache Software Foundation.
   

-  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks
   or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
@@ -2265,7 +2265,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   header="EL ${el.spec.version} - Apache 
Tomcat® ${version}"
   bottom="Copyright © 2000-${year} Apache Software Foundation.
   

-  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks
   or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
@@ -2289,7 +2289,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   header="WebSocket ${websocket.spec.version} - Apache 
Tomcat® ${version}"
   bottom="Copyright © 2000-${year} Apache Software Foundation.
   

-  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks
   or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
@@ -2313,7 +2313,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   header="JASPIC ${jaspic.spec.version} - Apache 
Tomcat® ${version}"
   bottom="Copyright © 2000-${year} Apache Software Foundation.
   

-  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks
   or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
@@ -2335,7 +2335,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   header="Apache Tomcat® 
${version}"
   bottom="Copyright © 2000-${year} Apache Software Foundation.
   

-  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are eit

(tomcat) branch 8.5.x updated: Remove trailing spaces

2023-12-29 Thread markt 
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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 0f2f33e9e7 Remove trailing spaces
0f2f33e9e7 is described below

commit 0f2f33e9e71a40586a47b4d3eb63a71c2e887e1e
Author: Mark Thomas 
AuthorDate: Fri Dec 29 17:50:12 2023 +

Remove trailing spaces
---
 build.xml | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.xml b/build.xml
index 1290ec40a3..6a7aa8594f 100644
--- a/build.xml
+++ b/build.xml
@@ -1890,7 +1890,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   header="Common Annotations ${annotation.spec.version} - Apache 
Tomcat® ${version}"
   bottom="Copyright © 2000-${year} Apache Software Foundation.
   

-  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks
   or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
@@ -1915,7 +1915,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   header="Servlet ${servlet.spec.version} - Apache 
Tomcat® ${version}"
   bottom="Copyright © 2000-${year} Apache Software Foundation.
   

-  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks
   or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
@@ -1940,7 +1940,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   header="JSP ${jsp.spec.version} - Apache 
Tomcat® ${version}"
   bottom="Copyright © 2000-${year} Apache Software Foundation.
   

-  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks
   or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
@@ -1965,7 +1965,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   header="EL ${el.spec.version} - Apache 
Tomcat® ${version}"
   bottom="Copyright © 2000-${year} Apache Software Foundation.
   

-  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks
   or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
@@ -1990,7 +1990,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   header="WebSocket ${websocket.spec.version} - Apache 
Tomcat® ${version}"
   bottom="Copyright © 2000-${year} Apache Software Foundation.
   

-  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks
   or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
@@ -2015,7 +2015,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   header="JASPIC ${jaspic.spec.version} - Apache 
Tomcat® ${version}"
   bottom="Copyright © 2000-${year} Apache Software Foundation.
   

-  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks
   or trademarks of the Apache Software Foundation."
   encoding="UTF-8"
   docencoding="UTF-8"
@@ -2037,7 +2037,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   header="Apache Tomcat® 
${version}"
   bottom="Copyright © 2000-${year} Apache Software Foundation.
   

-  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are either registered trademarks 
+  Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the 
Apache logo are eit

Buildbot success in on tomcat-10.1.x

2023-12-29 Thread buildbot 
Build status: Build succeeded!
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/44/builds/1077
Blamelist: Mark Thomas 
Build Text: build successful
Status Detected: restored build
Build Source Stamp: [branch 10.1.x] 48d9cbaf07622234a29e20a821d50bc5e8fcd435


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  compile: 1

  shell_6: 0

  shell_7: 0

  shell_8: 0

  shell_9: 0

  Rsync docs to nightlies.apache.org: 0

  shell_10: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 1

  shell_11: 0

  Rsync Logs to nightlies.apache.org: 0


-- ASF Buildbot


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

[Bug 68430] New: William Zhao

2023-12-29 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=68430

Bug ID: 68430
   Summary: William Zhao
   Product: Tomcat 9
   Version: unspecified
  Hardware: PC
Status: NEW
  Severity: trivial
  Priority: P2
 Component: EL
  Assignee: dev@tomcat.apache.org
  Reporter: sofeta2...@usoplay.com
  Target Milestone: -

Created attachment 39497
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=39497&action=edit
https://william-zhao.com/about/

William Zhao is a multifaceted individual with a passion for both technology
and art, seamlessly blending his expertise in software development with his
talent for painting vibrant landscapes. His innovative approach to
problem-solving and creativity continues to inspire those fortunate enough to
work alongside him.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 68430] William Zhao

2023-12-29 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=68430

asd123235  changed:

   What|Removed |Added

 OS||All

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org