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 <ma...@apache.org>
AuthorDate: Fri Dec 29 10:52:38 2023 +0000
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="<b>Common Annotations ${annotation.spec.version} - Apache
Tomcat ${version}</b>"
- bottom="Copyright &#169; 2000-${year} Apache Software Foundation.
All Rights Reserved."
+ doctitle="Common Annotations ${annotation.spec.version} API - Apache
Tomcat<sup>®</sup> ${version}"
+ header="<b>Common Annotations ${annotation.spec.version} - Apache
Tomcat<sup>®</sup> ${version}</b>"
+ bottom="Copyright &#169; 2000-${year} Apache Software Foundation.
+ <br/>
+ 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="<b>Servlet ${servlet.spec.version} - Apache Tomcat
${version}</b>"
- bottom="Copyright &#169; 2000-${year} Apache Software Foundation.
All Rights Reserved."
+ doctitle="Servlet ${servlet.spec.version} API - Apache
Tomcat<sup>®</sup> ${version}"
+ header="<b>Servlet ${servlet.spec.version} - Apache
Tomcat<sup>®</sup> ${version}</b>"
+ bottom="Copyright &#169; 2000-${year} Apache Software Foundation.
+ <br/>
+ 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="<b>JSP ${jsp.spec.version} - Apache Tomcat
${version}</b>"
- bottom="Copyright &#169; 2000-${year} Apache Software Foundation.
All Rights Reserved."
+ doctitle="JSP ${jsp.spec.version} API - Apache
Tomcat<sup>®</sup> ${version}"
+ header="<b>JSP ${jsp.spec.version} - Apache
Tomcat<sup>®</sup> ${version}</b>"
+ bottom="Copyright &#169; 2000-${year} Apache Software Foundation.
+ <br/>
+ 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="<b>EL ${el.spec.version} - Apache Tomcat
${version}</b>"
- bottom="Copyright &#169; 2000-${year} Apache Software Foundation.
All Rights Reserved."
+ doctitle="EL ${el.spec.version} API - Apache
Tomcat<sup>®</sup> ${version}"
+ header="<b>EL ${el.spec.version} - Apache
Tomcat<sup>®</sup> ${version}</b>"
+ bottom="Copyright &#169; 2000-${year} Apache Software Foundation.
+ <br/>
+ 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"
@@ -1974,9 +1986,12 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
destdir="${tomcat.dist}/webapps/docs/websocketapi"
version="true"
windowtitle="WebSocket ${websocket.spec.version} API Documentation -
Apache Tomcat ${version}"
- doctitle="WebSocket ${websocket.spec.version} API - Apache Tomcat
${version}"
- header="<b>WebSocket ${websocket.spec.version} - Apache Tomcat
${version}</b>"
- bottom="Copyright &#169; 2000-${year} Apache Software Foundation.
All Rights Reserved."
+ doctitle="WebSocket ${websocket.spec.version} API - Apache
Tomcat<sup>®</sup> ${version}"
+ header="<b>WebSocket ${websocket.spec.version} - Apache
Tomcat<sup>®</sup> ${version}</b>"
+ bottom="Copyright &#169; 2000-${year} Apache Software Foundation.
+ <br/>
+ 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"
@@ -1996,9 +2011,12 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
destdir="${tomcat.dist}/webapps/docs/jaspicapi"
version="true"
windowtitle="JASPIC ${jaspic.spec.version} API Documentation - Apache
Tomcat ${version}"
- doctitle="JASPIC ${jaspic.spec.version} API - Apache Tomcat ${version}"
- header="<b>JASPIC ${jaspic.spec.version} - Apache Tomcat
${version}</b>"
- bottom="Copyright &#169; 2000-${year} Apache Software Foundation.
All Rights Reserved."
+ doctitle="JASPIC ${jaspic.spec.version} API - Apache
Tomcat<sup>®</sup> ${version}"
+ header="<b>JASPIC ${jaspic.spec.version} - Apache
Tomcat<sup>®</sup> ${version}</b>"
+ bottom="Copyright &#169; 2000-${year} Apache Software Foundation.
+ <br/>
+ 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"
@@ -2015,9 +2033,12 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
destdir="${tomcat.dist}/webapps/docs/api"
version="true"
windowtitle="Apache Tomcat ${version} API Documentation"
- doctitle="Apache Tomcat ${version} API"
- header="<b>Apache Tomcat ${version}</b>"
- bottom="Copyright &#169; 2000-${year} Apache Software Foundation.
All Rights Reserved."
+ doctitle="Apache Tomcat<sup>®</sup> ${version} API"
+ header="<b>Apache Tomcat<sup>®</sup>
${version}</b>"
+ bottom="Copyright &#169; 2000-${year} Apache Software Foundation.
+ <br/>
+ 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"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
