(tomcat) branch main updated: Trademark improvements

[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 <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 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="&lt;b&gt;Common Annotations ${annotation.spec.version} - Apache 
Tomcat ${version}&lt;/b&gt;"
-      bottom="Copyright &amp;#169; 2000-${year} Apache Software Foundation. 
All Rights Reserved."
+      doctitle="Common Annotations ${annotation.spec.version} API - Apache 
Tomcat&lt;sup&gt;&#174;&lt;/sup&gt; ${version}"
+      header="&lt;b&gt;Common Annotations ${annotation.spec.version} - Apache 
Tomcat&lt;sup&gt;&#174;&lt;/sup&gt; ${version}&lt;/b&gt;"
+      bottom="Copyright &amp;#169; 2000-${year} Apache Software Foundation.
+              &lt;br/&gt;
+              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="&lt;b&gt;Servlet ${servlet.spec.version} - Apache Tomcat 
${version}&lt;/b&gt;"
-      bottom="Copyright &amp;#169; 2000-${year} Apache Software Foundation. 
All Rights Reserved."
+      doctitle="Servlet ${servlet.spec.version} API - Apache 
Tomcat&lt;sup&gt;&#174;&lt;/sup&gt; ${version}"
+      header="&lt;b&gt;Servlet ${servlet.spec.version} - Apache 
Tomcat&lt;sup&gt;&#174;&lt;/sup&gt; ${version}&lt;/b&gt;"
+      bottom="Copyright &amp;#169; 2000-${year} Apache Software Foundation.
+              &lt;br/&gt;
+              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="&lt;b&gt;JSP ${jsp.spec.version} - Apache Tomcat 
${version}&lt;/b&gt;"
-      bottom="Copyright &amp;#169; 2000-${year} Apache Software Foundation. 
All Rights Reserved."
+      doctitle="JSP ${jsp.spec.version} API - Apache 
Tomcat&lt;sup&gt;&#174;&lt;/sup&gt; ${version}"
+      header="&lt;b&gt;JSP ${jsp.spec.version} - Apache 
Tomcat&lt;sup&gt;&#174;&lt;/sup&gt; ${version}&lt;/b&gt;"
+      bottom="Copyright &amp;#169; 2000-${year} Apache Software Foundation.
+              &lt;br/&gt;
+              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="&lt;b&gt;EL ${el.spec.version} - Apache Tomcat 
${version}&lt;/b&gt;"
-      bottom="Copyright &amp;#169; 2000-${year} Apache Software Foundation. 
All Rights Reserved."
+      doctitle="EL ${el.spec.version} API - Apache 
Tomcat&lt;sup&gt;&#174;&lt;/sup&gt; ${version}"
+      header="&lt;b&gt;EL ${el.spec.version} - Apache 
Tomcat&lt;sup&gt;&#174;&lt;/sup&gt; ${version}&lt;/b&gt;"
+      bottom="Copyright &amp;#169; 2000-${year} Apache Software Foundation.
+              &lt;br/&gt;
+              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 ${version}"
-      doctitle="WebSocket ${websocket.spec.version} API - Apache Tomcat 
${version}"
-      header="&lt;b&gt;WebSocket ${websocket.spec.version} - Apache Tomcat 
${version}&lt;/b&gt;"
-      bottom="Copyright &amp;#169; 2000-${year} Apache Software Foundation. 
All Rights Reserved."
+      doctitle="WebSocket ${websocket.spec.version} API - Apache 
Tomcat&lt;sup&gt;&#174;&lt;/sup&gt; ${version}"
+      header="&lt;b&gt;WebSocket ${websocket.spec.version} - Apache 
Tomcat&lt;sup&gt;&#174;&lt;/sup&gt; ${version}&lt;/b&gt;"
+      bottom="Copyright &amp;#169; 2000-${year} Apache Software Foundation.
+              &lt;br/&gt;
+              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"
@@ -2315,9 +2330,12 @@
       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="&lt;b&gt;JASPIC ${jaspic.spec.version} - Apache Tomcat 
${version}&lt;/b&gt;"
-      bottom="Copyright &amp;#169; 2000-${year} Apache Software Foundation. 
All Rights Reserved."
+      doctitle="JASPIC ${jaspic.spec.version} API - Apache 
Tomcat&lt;sup&gt;&#174;&lt;/sup&gt; ${version}"
+      header="&lt;b&gt;JASPIC ${jaspic.spec.version} - Apache 
Tomcat&lt;sup&gt;&#174;&lt;/sup&gt; ${version}&lt;/b&gt;"
+      bottom="Copyright &amp;#169; 2000-${year} Apache Software Foundation.
+              &lt;br/&gt;
+              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"
@@ -2334,9 +2352,12 @@
       destdir="${tomcat.dist}/webapps/docs/api"
       version="true"
       windowtitle="Apache Tomcat ${version} API Documentation"
-      doctitle="Apache Tomcat ${version} API"
-      header="&lt;b&gt;Apache Tomcat ${version}&lt;/b&gt;"
-      bottom="Copyright &amp;#169; 2000-${year} Apache Software Foundation. 
All Rights Reserved."
+      doctitle="Apache Tomcat&lt;sup&gt;&#174;&lt;/sup&gt; ${version} API"
+      header="&lt;b&gt;Apache Tomcat&lt;sup&gt;&#174;&lt;/sup&gt; 
${version}&lt;/b&gt;"
+      bottom="Copyright &amp;#169; 2000-${year} Apache Software Foundation.
+              &lt;br/&gt;
+              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