diff --git a/build.xml b/build.xml index 3a9e9dcb1624..c985b9bb5e04 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="<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" @@ -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="<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" @@ -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="<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" @@ -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="<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" @@ -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="<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" @@ -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="<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" @@ -2334,9 +2352,12 @@ 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"