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 <a href="security.html">Security Rep
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ 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
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/conference.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/conference.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/conference.html (original)
+++ tomcat/site/trunk/docs/conference.html Fri Dec 29 10:28:58 2023
@@ -54,7 +54,7 @@
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/contact.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/contact.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/contact.html (original)
+++ tomcat/site/trunk/docs/contact.html Fri Dec 29 10:28:58 2023
@@ -36,7 +36,7 @@ Apache sites at once.
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/download-10.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-10.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-10.html (original)
+++ tomcat/site/trunk/docs/download-10.html Fri Dec 29 10:28:58 2023
@@ -153,7 +153,7 @@
   </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/download-11.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-11.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-11.html (original)
+++ tomcat/site/trunk/docs/download-11.html Fri Dec 29 10:28:58 2023
@@ -148,7 +148,7 @@
   </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/download-80.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-80.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-80.html (original)
+++ tomcat/site/trunk/docs/download-80.html Fri Dec 29 10:28:58 2023
@@ -154,7 +154,7 @@
     </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/download-90.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-90.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-90.html (original)
+++ tomcat/site/trunk/docs/download-90.html Fri Dec 29 10:28:58 2023
@@ -145,7 +145,7 @@
     </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/download-connectors.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-connectors.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-connectors.html (original)
+++ tomcat/site/trunk/docs/download-connectors.html Fri Dec 29 10:28:58 2023
@@ -100,7 +100,7 @@
     </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/download-migration.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-migration.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-migration.html (original)
+++ tomcat/site/trunk/docs/download-migration.html Fri Dec 29 10:28:58 2023
@@ -86,7 +86,7 @@
     </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/download-native.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-native.html (original)
+++ tomcat/site/trunk/docs/download-native.html Fri Dec 29 10:28:58 2023
@@ -151,7 +151,7 @@
     </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/download-taglibs.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-taglibs.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-taglibs.html (original)
+++ tomcat/site/trunk/docs/download-taglibs.html Fri Dec 29 10:28:58 2023
@@ -102,7 +102,7 @@
     </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/findhelp.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/findhelp.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/findhelp.html (original)
+++ tomcat/site/trunk/docs/findhelp.html Fri Dec 29 10:28:58 2023
@@ -60,7 +60,7 @@ Wiki</a>.</p>
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/getinvolved.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/getinvolved.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/getinvolved.html (original)
+++ tomcat/site/trunk/docs/getinvolved.html Fri Dec 29 10:28:58 2023
@@ -60,7 +60,7 @@ Apache Tomcat has very loosely defined c
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/heritage.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/heritage.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/heritage.html (original)
+++ tomcat/site/trunk/docs/heritage.html Fri Dec 29 10:28:58 2023
@@ -19,7 +19,7 @@ and oversight structure to manage itself
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Fri Dec 29 10:28:58 2023
@@ -264,7 +264,7 @@ version in your project's plugin configu
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/irc.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/irc.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/irc.html (original)
+++ tomcat/site/trunk/docs/irc.html Fri Dec 29 10:28:58 2023
@@ -13,7 +13,7 @@
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/legal.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/legal.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/legal.html (original)
+++ tomcat/site/trunk/docs/legal.html Fri Dec 29 10:28:58 2023
@@ -54,7 +54,7 @@ Version 2.0 (current)</a>.
   </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/lists.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/lists.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/lists.html (original)
+++ tomcat/site/trunk/docs/lists.html Fri Dec 29 10:28:58 2023
@@ -336,7 +336,7 @@ Note: This mailing list was formerly kno
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/maven-plugin.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/maven-plugin.html (original)
+++ tomcat/site/trunk/docs/maven-plugin.html Fri Dec 29 10:28:58 2023
@@ -36,7 +36,7 @@
     </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/migration-10.1.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-10.1.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-10.1.html (original)
+++ tomcat/site/trunk/docs/migration-10.1.html Fri Dec 29 10:28:58 2023
@@ -249,7 +249,7 @@ versions of Apache Tomcat<sup>&reg;</sup
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/migration-10.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-10.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-10.html (original)
+++ tomcat/site/trunk/docs/migration-10.html Fri Dec 29 10:28:58 2023
@@ -285,7 +285,7 @@ versions of Apache Tomcat<sup>&reg;</sup
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/migration-11.0.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-11.0.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-11.0.html (original)
+++ tomcat/site/trunk/docs/migration-11.0.html Fri Dec 29 10:28:58 2023
@@ -182,7 +182,7 @@ versions of Apache Tomcat<sup>&reg;</sup
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/migration-6.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-6.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-6.html (original)
+++ tomcat/site/trunk/docs/migration-6.html Fri Dec 29 10:28:58 2023
@@ -319,7 +319,7 @@ versions of Apache Tomcat<sup>&reg;</sup
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/migration-7.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-7.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-7.html (original)
+++ tomcat/site/trunk/docs/migration-7.html Fri Dec 29 10:28:58 2023
@@ -711,7 +711,7 @@ versions of Apache Tomcat<sup>&reg;</sup
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/migration-8.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-8.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-8.html (original)
+++ tomcat/site/trunk/docs/migration-8.html Fri Dec 29 10:28:58 2023
@@ -508,7 +508,7 @@ versions of Apache Tomcat<sup>&reg;</sup
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/migration-85.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-85.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-85.html (original)
+++ tomcat/site/trunk/docs/migration-85.html Fri Dec 29 10:28:58 2023
@@ -497,7 +497,7 @@ versions of Apache Tomcat<sup>&reg;</sup
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/migration-9.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-9.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-9.html (original)
+++ tomcat/site/trunk/docs/migration-9.html Fri Dec 29 10:28:58 2023
@@ -571,7 +571,7 @@ versions of Apache Tomcat<sup>&reg;</sup
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/migration.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration.html (original)
+++ tomcat/site/trunk/docs/migration.html Fri Dec 29 10:28:58 2023
@@ -81,7 +81,7 @@ accordingly.</p>
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/oldnews-2010.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2010.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2010.html (original)
+++ tomcat/site/trunk/docs/oldnews-2010.html Fri Dec 29 10:28:58 2023
@@ -199,7 +199,7 @@ Apache Tomcat. This release includes man
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/oldnews-2011.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2011.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2011.html (original)
+++ tomcat/site/trunk/docs/oldnews-2011.html Fri Dec 29 10:28:58 2023
@@ -321,7 +321,7 @@ Apache Tomcat. This release includes bug
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/oldnews-2012.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2012.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2012.html (original)
+++ tomcat/site/trunk/docs/oldnews-2012.html Fri Dec 29 10:28:58 2023
@@ -386,7 +386,7 @@ fixes over Apache Tomcat 5.5.34.
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/oldnews-2013.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2013.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2013.html (original)
+++ tomcat/site/trunk/docs/oldnews-2013.html Fri Dec 29 10:28:58 2023
@@ -437,7 +437,7 @@ for details.
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/oldnews-2014.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2014.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2014.html (original)
+++ tomcat/site/trunk/docs/oldnews-2014.html Fri Dec 29 10:28:58 2023
@@ -616,7 +616,7 @@ Please see the <a href="taglibs/standard
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/oldnews-2015.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2015.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2015.html (original)
+++ tomcat/site/trunk/docs/oldnews-2015.html Fri Dec 29 10:28:58 2023
@@ -636,7 +636,7 @@ Full details of these changes, and all t
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/oldnews-2016.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2016.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2016.html (original)
+++ tomcat/site/trunk/docs/oldnews-2016.html Fri Dec 29 10:28:58 2023
@@ -833,7 +833,7 @@ using 1.2.x in preference to 1.1.x.</p>
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/oldnews-2017.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2017.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2017.html (original)
+++ tomcat/site/trunk/docs/oldnews-2017.html Fri Dec 29 10:28:58 2023
@@ -882,7 +882,7 @@ changelog</a>.
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/oldnews-2018.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2018.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2018.html (original)
+++ tomcat/site/trunk/docs/oldnews-2018.html Fri Dec 29 10:28:58 2023
@@ -850,7 +850,7 @@ changelog</a>.
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/oldnews-2019.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2019.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2019.html (original)
+++ tomcat/site/trunk/docs/oldnews-2019.html Fri Dec 29 10:28:58 2023
@@ -667,7 +667,7 @@ Tomcat Native. The notable changes since
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/oldnews-2020.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2020.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2020.html (original)
+++ tomcat/site/trunk/docs/oldnews-2020.html Fri Dec 29 10:28:58 2023
@@ -1031,7 +1031,7 @@ changelog</a>.
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/oldnews-2021.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2021.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2021.html (original)
+++ tomcat/site/trunk/docs/oldnews-2021.html Fri Dec 29 10:28:58 2023
@@ -1186,7 +1186,7 @@ changelog</a>.
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/oldnews-2022.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2022.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2022.html (original)
+++ tomcat/site/trunk/docs/oldnews-2022.html Fri Dec 29 10:28:58 2023
@@ -1384,7 +1384,7 @@ changelog</a>.
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/oldnews.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews.html (original)
+++ tomcat/site/trunk/docs/oldnews.html Fri Dec 29 10:28:58 2023
@@ -1555,7 +1555,7 @@ changelog</a>.
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/presentations.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/presentations.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/presentations.html (original)
+++ tomcat/site/trunk/docs/presentations.html Fri Dec 29 10:28:58 2023
@@ -686,7 +686,7 @@ Apache Tomcat project (markt)
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/resources.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/resources.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/resources.html (original)
+++ tomcat/site/trunk/docs/resources.html Fri Dec 29 10:28:58 2023
@@ -92,7 +92,7 @@
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/security-10.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-10.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-10.html (original)
+++ tomcat/site/trunk/docs/security-10.html Fri Dec 29 10:28:58 2023
@@ -811,7 +811,7 @@
   </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/security-11.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-11.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-11.html (original)
+++ tomcat/site/trunk/docs/security-11.html Fri Dec 29 10:28:58 2023
@@ -207,7 +207,7 @@
   </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/security-3.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-3.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-3.html (original)
+++ tomcat/site/trunk/docs/security-3.html Fri Dec 29 10:28:58 2023
@@ -166,7 +166,7 @@
   </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/security-4.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-4.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-4.html (original)
+++ tomcat/site/trunk/docs/security-4.html Fri Dec 29 10:28:58 2023
@@ -547,7 +547,7 @@
   </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/security-5.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-5.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-5.html (original)
+++ tomcat/site/trunk/docs/security-5.html Fri Dec 29 10:28:58 2023
@@ -914,7 +914,7 @@
   </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/security-6.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-6.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-6.html (original)
+++ tomcat/site/trunk/docs/security-6.html Fri Dec 29 10:28:58 2023
@@ -1561,7 +1561,7 @@
   </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/security-7.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-7.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-7.html (original)
+++ tomcat/site/trunk/docs/security-7.html Fri Dec 29 10:28:58 2023
@@ -2026,7 +2026,7 @@
   </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/security-8.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-8.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-8.html (original)
+++ tomcat/site/trunk/docs/security-8.html Fri Dec 29 10:28:58 2023
@@ -2278,7 +2278,7 @@
   </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/security-9.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-9.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-9.html (original)
+++ tomcat/site/trunk/docs/security-9.html Fri Dec 29 10:28:58 2023
@@ -1641,7 +1641,7 @@
   </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/security-impact.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-impact.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-impact.html (original)
+++ tomcat/site/trunk/docs/security-impact.html Fri Dec 29 10:28:58 2023
@@ -43,7 +43,7 @@
   </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/security-jk.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-jk.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-jk.html (original)
+++ tomcat/site/trunk/docs/security-jk.html Fri Dec 29 10:28:58 2023
@@ -214,7 +214,7 @@
   </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/security-native.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-native.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-native.html (original)
+++ tomcat/site/trunk/docs/security-native.html Fri Dec 29 10:28:58 2023
@@ -111,7 +111,7 @@
   </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/security-taglibs.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-taglibs.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-taglibs.html (original)
+++ tomcat/site/trunk/docs/security-taglibs.html Fri Dec 29 10:28:58 2023
@@ -32,7 +32,7 @@
     </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/security.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security.html (original)
+++ tomcat/site/trunk/docs/security.html Fri Dec 29 10:28:58 2023
@@ -112,7 +112,7 @@
   </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/source.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/source.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/source.html (original)
+++ tomcat/site/trunk/docs/source.html Fri Dec 29 10:28:58 2023
@@ -194,7 +194,7 @@ you'll never use them on Windows.</p>
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/taglibs.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/taglibs.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/taglibs.html (original)
+++ tomcat/site/trunk/docs/taglibs.html Fri Dec 29 10:28:58 2023
@@ -51,7 +51,7 @@
     </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/tomcat-10.0-eol.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-10.0-eol.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tomcat-10.0-eol.html (original)
+++ tomcat/site/trunk/docs/tomcat-10.0-eol.html Fri Dec 29 10:28:58 2023
@@ -26,7 +26,7 @@ ended on 31 October 2022.</p>
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/tomcat-55-eol.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-55-eol.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tomcat-55-eol.html (original)
+++ tomcat/site/trunk/docs/tomcat-55-eol.html Fri Dec 29 10:28:58 2023
@@ -30,7 +30,7 @@ before 30 September 2012.</p>
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/tomcat-60-eol.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-60-eol.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tomcat-60-eol.html (original)
+++ tomcat/site/trunk/docs/tomcat-60-eol.html Fri Dec 29 10:28:58 2023
@@ -30,7 +30,7 @@ before 31 December 2016.</p>
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/tomcat-70-eol.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-70-eol.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tomcat-70-eol.html (original)
+++ tomcat/site/trunk/docs/tomcat-70-eol.html Fri Dec 29 10:28:58 2023
@@ -29,7 +29,7 @@ before 31 March 2021.</p>
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/tomcat-80-eol.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-80-eol.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tomcat-80-eol.html (original)
+++ tomcat/site/trunk/docs/tomcat-80-eol.html Fri Dec 29 10:28:58 2023
@@ -29,7 +29,7 @@ before 30 June 2018.</p>
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/tomcat-85-eol.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-85-eol.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tomcat-85-eol.html (original)
+++ tomcat/site/trunk/docs/tomcat-85-eol.html Fri Dec 29 10:28:58 2023
@@ -29,7 +29,7 @@ before 31 March 2024.</p>
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/tools.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tools.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tools.html (original)
+++ tomcat/site/trunk/docs/tools.html Fri Dec 29 10:28:58 2023
@@ -111,7 +111,7 @@ and a committer should be able to fix it
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/upgrading.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/upgrading.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/upgrading.html (original)
+++ tomcat/site/trunk/docs/upgrading.html Fri Dec 29 10:28:58 2023
@@ -162,7 +162,7 @@
   </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/whichversion.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/whichversion.html (original)
+++ tomcat/site/trunk/docs/whichversion.html Fri Dec 29 10:28:58 2023
@@ -481,7 +481,7 @@ later.</p>
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/docs/whoweare.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whoweare.html?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/docs/whoweare.html (original)
+++ tomcat/site/trunk/docs/whoweare.html Fri Dec 29 10:28:58 2023
@@ -223,7 +223,7 @@ Emeritus</a> is defined in the Apache gl
 </div></div></div></div></main><footer id="footer">
     Copyright &copy; 1999-2023, The Apache Software Foundation
     <br>
-    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.
   </footer></div><script src="res/js/tomcat.js"></script></body></html>
\ No newline at end of file

Modified: tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl?rev=1914975&r1=1914974&r2=1914975&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl (original)
+++ tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Fri Dec 29 10:28:58 2023
@@ -148,9 +148,9 @@
   <footer id="footer">
     Copyright © 1999-2023, The Apache Software Foundation
     <br/>
-    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.
   </footer>
 </div>
 <script src="res/js/tomcat.js"></script>



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

Reply via email to