Modified: tomcat/site/trunk/docs/tools.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tools.html?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/docs/tools.html (original) +++ tomcat/site/trunk/docs/tools.html Thu Dec 28 11:15:41 2023 @@ -2,7 +2,7 @@ <html lang="en"><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1"><link href="res/css/tomcat.css" rel="stylesheet" type="text/css"><link href="res/css/fonts/fonts.css" rel="stylesheet" type="text/css"><title>Apache Tomcat® - Developer Tools</title><meta name="author" content="Apache Tomcat Project"><script src="https://www.apachecon.com/event-images/snippet.js";></script></head><body><div id="wrapper"><header id="header"><div class="clearfix"><div class="menu-toggler pull-left" tabindex="1"><div class="hamburger"></div></div><a href="http://tomcat.apache.org/";><img class="tomcat-logo pull-left noPrint" alt="Tomcat Home" src="res/images/tomcat.png"></a><h1 class="pull-left">Apache Tomcat<sup>®</sup></h1><div class="asf-logos pull-right"><a href="https://www.apache.org/foundation/contributing.html"; target="_blank" class="pull-left"><img src="https://www.apache.org/images/SupportApache-sma ll.png" class="support-asf" alt="Support Apache"></a><a href="http://www.apache.org/"; target="_blank" class="pull-left"><img src="res/images/asf_logo.svg" class="asf-logo" alt="The Apache Software Foundation"></a></div></div></header><main id="middle"><div><div id="mainLeft"><div id="nav-wrapper"><form action="https://www.google.com/search"; method="get"><div class="searchbox"><input value="tomcat.apache.org" name="sitesearch" type="hidden"><input aria-label="Search text" placeholder="Search…" required="required" name="q" id="query" type="search"><button>GO</button></div></form><div class="asfevents"><a class="acevent" data-format="square" data-width="150"></a></div><nav><div><h2>Apache Tomcat</h2><ul><li><a href="./index.html">Home</a></li><li><a href="./taglibs.html">Taglibs</a></li><li><a href="./maven-plugin.html">Maven Plugin</a></li></ul></div><div><h2>Download</h2><ul><li><a href="./whichversion.html">Which version?</a></li><li><a href="https://tomcat.apache.org/downloa d-11.cgi">Tomcat 11 (alpha)</a></li><li><a href="https://tomcat.apache.org/download-10.cgi";>Tomcat 10</a></li><li><a href="https://tomcat.apache.org/download-90.cgi";>Tomcat 9</a></li><li><a href="https://tomcat.apache.org/download-80.cgi";>Tomcat 8</a></li><li><a href="https://tomcat.apache.org/download-migration.cgi";>Tomcat Migration Tool for Jakarta EE</a></li><li><a href="https://tomcat.apache.org/download-connectors.cgi";>Tomcat Connectors</a></li><li><a href="https://tomcat.apache.org/download-native.cgi";>Tomcat Native</a></li><li><a href="https://tomcat.apache.org/download-taglibs.cgi";>Taglibs</a></li><li><a href="https://archive.apache.org/dist/tomcat/";>Archives</a></li></ul></div><div><h2>Documentation</h2><ul><li><a href="./tomcat-11.0-doc/index.html">Tomcat 11.0 (alpha)</a></li><li><a href="./tomcat-10.1-doc/index.html">Tomcat 10.1</a></li><li><a href="./tomcat-9.0-doc/index.html">Tomcat 9.0</a></li><li><a href="./tomcat-8.5-doc/index.html">Tomcat 8.5</a></li><li><a href="./ upgrading.html">Upgrading</a></li><li><a href="./connectors-doc/">Tomcat Connectors</a></li><li><a href="./native-doc/">Tomcat Native 2</a></li><li><a href="./native-1.2-doc/">Tomcat Native 1.2</a></li><li><a href="https://cwiki.apache.org/confluence/display/TOMCAT";>Wiki</a></li><li><a href="./migration.html">Migration Guide</a></li><li><a href="./presentations.html">Presentations</a></li><li><a href="https://cwiki.apache.org/confluence/x/Bi8lBg";>Specifications</a></li></ul></div><div><h2>Problems?</h2><ul><li><a href="./security.html">Security Reports</a></li><li><a href="./findhelp.html">Find help</a></li><li><a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQ</a></li><li><a href="./lists.html">Mailing Lists</a></li><li><a href="./bugreport.html">Bug Database</a></li><li><a href="./irc.html">IRC</a></li></ul></div><div><h2>Get Involved</h2><ul><li><a href="./getinvolved.html">Overview</a></li><li><a href="./source.html">Source code</a></li><li><a href="./ci.html"> Buildbot</a></li><li><a href="https://cwiki.apache.org/confluence/x/vIPzBQ";>Translations</a></li><li><a href="./tools.html">Tools</a></li></ul></div><div><h2>Media</h2><ul><li><a href="https://twitter.com/theapachetomcat";>Twitter</a></li><li><a href="https://www.youtube.com/c/ApacheTomcatOfficial";>YouTube</a></li><li><a href="https://blogs.apache.org/tomcat/";>Blog</a></li></ul></div><div><h2>Misc</h2><ul><li><a href="./whoweare.html">Who We Are</a></li><li><a href="https://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>Swag</a></li><li><a href="./heritage.html">Heritage</a></li><li><a href="http://www.apache.org";>Apache Home</a></li><li><a href="./resources.html">Resources</a></li><li><a href="./contact.html">Contact</a></li><li><a href="./legal.html">Legal</a></li><li><a href="https://privacy.apache.org/policies/privacy-policy-public.html";>Privacy</a></li><li><a href="https://www.apache.org/foundation/contributing.html";>Support Apache</a></li><li><a href="https://www .apache.org/foundation/sponsorship.html">Sponsorship</a></li><li><a href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li><li><a href="http://www.apache.org/licenses/";>License</a></li></ul></div></nav></div></div><div id="mainRight"><div id="content"><h2 style="display: none;">Content</h2><h3 id="Table_of_Contents">Table of Contents</h3><div class="text"> <ul><li><a href="#Overview">Overview</a></li><li><a href="#Apache_Tools">Apache Tools</a></li><li><a href="#Open_Source_Tools">Open Source Tools</a></li><li><a href="#Commercial_Tools">Commercial Tools</a></li></ul> </div><h3 id="Overview">Overview</h3><div class="text"> -<p>This page lists the various tools that the Apache Tomcat project uses. Not +<p>This page lists the various tools that the Apache Tomcat<sup>®</sup> project uses. Not all developers use every tool. There are almost certainly some tools that are missing. If you are a committer, you know how to fix this. If you are not a committer, send a short note to the <a href="lists.html#tomcat-dev">developer
Modified: tomcat/site/trunk/docs/upgrading.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/upgrading.html?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/docs/upgrading.html (original) +++ tomcat/site/trunk/docs/upgrading.html Thu Dec 28 11:15:41 2023 @@ -1,6 +1,6 @@ <!DOCTYPE html SYSTEM "about:legacy-compat"> <html lang="en"><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1"><link href="res/css/tomcat.css" rel="stylesheet" type="text/css"><link href="res/css/fonts/fonts.css" rel="stylesheet" type="text/css"><title>Apache Tomcat® - Upgrading Apache Tomcat</title><meta name="author" content="Apache Tomcat Project"><meta name="google-site-verification" content="nA9F0GvGNjVCU9W7HBziONQVx6FehvgQglI1X7WPfRw"><script src="https://www.apachecon.com/event-images/snippet.js";></script></head><body><div id="wrapper"><header id="header"><div class="clearfix"><div class="menu-toggler pull-left" tabindex="1"><div class="hamburger"></div></div><a href="http://tomcat.apache.org/";><img class="tomcat-logo pull-left noPrint" alt="Tomcat Home" src="res/images/tomcat.png"></a><h1 class="pull-left">Apache Tomcat<sup>®</sup></h1><div class="asf-logos pull-right"><a href="https://www.apache.org/foundation/contributi ng.html" target="_blank" class="pull-left"><img src="https://www.apache.org/images/SupportApache-small.png"; class="support-asf" alt="Support Apache"></a><a href="http://www.apache.org/"; target="_blank" class="pull-left"><img src="res/images/asf_logo.svg" class="asf-logo" alt="The Apache Software Foundation"></a></div></div></header><main id="middle"><div><div id="mainLeft"><div id="nav-wrapper"><form action="https://www.google.com/search"; method="get"><div class="searchbox"><input value="tomcat.apache.org" name="sitesearch" type="hidden"><input aria-label="Search text" placeholder="Search…" required="required" name="q" id="query" type="search"><button>GO</button></div></form><div class="asfevents"><a class="acevent" data-format="square" data-width="150"></a></div><nav><div><h2>Apache Tomcat</h2><ul><li><a href="./index.html">Home</a></li><li><a href="./taglibs.html">Taglibs</a></li><li><a href="./maven-plugin.html">Maven Plugin</a></li></ul></div><div><h2>Download</h2><ul><li ><a href="./whichversion.html">Which version?</a></li><li><a >href="https://tomcat.apache.org/download-11.cgi";>Tomcat 11 >(alpha)</a></li><li><a >href="https://tomcat.apache.org/download-10.cgi";>Tomcat 10</a></li><li><a >href="https://tomcat.apache.org/download-90.cgi";>Tomcat 9</a></li><li><a >href="https://tomcat.apache.org/download-80.cgi";>Tomcat 8</a></li><li><a >href="https://tomcat.apache.org/download-migration.cgi";>Tomcat Migration Tool >for Jakarta EE</a></li><li><a >href="https://tomcat.apache.org/download-connectors.cgi";>Tomcat >Connectors</a></li><li><a >href="https://tomcat.apache.org/download-native.cgi";>Tomcat >Native</a></li><li><a >href="https://tomcat.apache.org/download-taglibs.cgi";>Taglibs</a></li><li><a >href="https://archive.apache.org/dist/tomcat/";>Archives</a></li></ul></div><div><h2>Documentation</h2><ul><li><a > href="./tomcat-11.0-doc/index.html">Tomcat 11.0 (alpha)</a></li><li><a >href="./tomcat-10.1-doc/index.html">Tomcat 10.1</a></li><li><a >href="./tomcat-9.0-doc/index.h tml">Tomcat 9.0</a></li><li><a href="./tomcat-8.5-doc/index.html">Tomcat 8.5</a></li><li><a href="./upgrading.html">Upgrading</a></li><li><a href="./connectors-doc/">Tomcat Connectors</a></li><li><a href="./native-doc/">Tomcat Native 2</a></li><li><a href="./native-1.2-doc/">Tomcat Native 1.2</a></li><li><a href="https://cwiki.apache.org/confluence/display/TOMCAT";>Wiki</a></li><li><a href="./migration.html">Migration Guide</a></li><li><a href="./presentations.html">Presentations</a></li><li><a href="https://cwiki.apache.org/confluence/x/Bi8lBg";>Specifications</a></li></ul></div><div><h2>Problems?</h2><ul><li><a href="./security.html">Security Reports</a></li><li><a href="./findhelp.html">Find help</a></li><li><a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQ</a></li><li><a href="./lists.html">Mailing Lists</a></li><li><a href="./bugreport.html">Bug Database</a></li><li><a href="./irc.html">IRC</a></li></ul></div><div><h2>Get Involved</h2><ul><li><a href="./getinvo lved.html">Overview</a></li><li><a href="./source.html">Source code</a></li><li><a href="./ci.html">Buildbot</a></li><li><a href="https://cwiki.apache.org/confluence/x/vIPzBQ";>Translations</a></li><li><a href="./tools.html">Tools</a></li></ul></div><div><h2>Media</h2><ul><li><a href="https://twitter.com/theapachetomcat";>Twitter</a></li><li><a href="https://www.youtube.com/c/ApacheTomcatOfficial";>YouTube</a></li><li><a href="https://blogs.apache.org/tomcat/";>Blog</a></li></ul></div><div><h2>Misc</h2><ul><li><a href="./whoweare.html">Who We Are</a></li><li><a href="https://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>Swag</a></li><li><a href="./heritage.html">Heritage</a></li><li><a href="http://www.apache.org";>Apache Home</a></li><li><a href="./resources.html">Resources</a></li><li><a href="./contact.html">Contact</a></li><li><a href="./legal.html">Legal</a></li><li><a href="https://privacy.apache.org/policies/privacy-policy-public.html";>Privacy</a></li><li><a href=" https://www.apache.org/foundation/contributing.html";>Support Apache</a></li><li><a href="https://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li><li><a href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li><li><a href="http://www.apache.org/licenses/";>License</a></li></ul></div></nav></div></div><div id="mainRight"><div id="content"><h2 style="display: none;">Content</h2><h3 id="Overview">Overview</h3><div class="text"> - Upgrading Apache Tomcat can be straightforward or complicated, depending + Upgrading Apache Tomcat<sup>®</sup> can be straightforward or complicated, depending upon the complexity of your environment. This document explains some of the basics of upgrading Apache Tomcat and can be used as a starting point for you to establish your own environment-specific upgrade plans and procedures. Modified: tomcat/site/trunk/docs/whoweare.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whoweare.html?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/docs/whoweare.html (original) +++ tomcat/site/trunk/docs/whoweare.html Thu Dec 28 11:15:41 2023 @@ -1,7 +1,7 @@ <!DOCTYPE html SYSTEM "about:legacy-compat"> <html lang="en"><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1"><link href="res/css/tomcat.css" rel="stylesheet" type="text/css"><link href="res/css/fonts/fonts.css" rel="stylesheet" type="text/css"><title>Apache Tomcat® - Who We Are</title><script src="https://www.apachecon.com/event-images/snippet.js";></script></head><body><div id="wrapper"><header id="header"><div class="clearfix"><div class="menu-toggler pull-left" tabindex="1"><div class="hamburger"></div></div><a href="http://tomcat.apache.org/";><img class="tomcat-logo pull-left noPrint" alt="Tomcat Home" src="res/images/tomcat.png"></a><h1 class="pull-left">Apache Tomcat<sup>®</sup></h1><div class="asf-logos pull-right"><a href="https://www.apache.org/foundation/contributing.html"; target="_blank" class="pull-left"><img src="https://www.apache.org/images/SupportApache-small.png"; class="support-asf" alt="Support Apache"></a><a h ref="http://www.apache.org/"; target="_blank" class="pull-left"><img src="res/images/asf_logo.svg" class="asf-logo" alt="The Apache Software Foundation"></a></div></div></header><main id="middle"><div><div id="mainLeft"><div id="nav-wrapper"><form action="https://www.google.com/search"; method="get"><div class="searchbox"><input value="tomcat.apache.org" name="sitesearch" type="hidden"><input aria-label="Search text" placeholder="Search…" required="required" name="q" id="query" type="search"><button>GO</button></div></form><div class="asfevents"><a class="acevent" data-format="square" data-width="150"></a></div><nav><div><h2>Apache Tomcat</h2><ul><li><a href="./index.html">Home</a></li><li><a href="./taglibs.html">Taglibs</a></li><li><a href="./maven-plugin.html">Maven Plugin</a></li></ul></div><div><h2>Download</h2><ul><li><a href="./whichversion.html">Which version?</a></li><li><a href="https://tomcat.apache.org/download-11.cgi";>Tomcat 11 (alpha)</a></li><li><a href="https:// tomcat.apache.org/download-10.cgi">Tomcat 10</a></li><li><a href="https://tomcat.apache.org/download-90.cgi";>Tomcat 9</a></li><li><a href="https://tomcat.apache.org/download-80.cgi";>Tomcat 8</a></li><li><a href="https://tomcat.apache.org/download-migration.cgi";>Tomcat Migration Tool for Jakarta EE</a></li><li><a href="https://tomcat.apache.org/download-connectors.cgi";>Tomcat Connectors</a></li><li><a href="https://tomcat.apache.org/download-native.cgi";>Tomcat Native</a></li><li><a href="https://tomcat.apache.org/download-taglibs.cgi";>Taglibs</a></li><li><a href="https://archive.apache.org/dist/tomcat/";>Archives</a></li></ul></div><div><h2>Documentation</h2><ul><li><a href="./tomcat-11.0-doc/index.html">Tomcat 11.0 (alpha)</a></li><li><a href="./tomcat-10.1-doc/index.html">Tomcat 10.1</a></li><li><a href="./tomcat-9.0-doc/index.html">Tomcat 9.0</a></li><li><a href="./tomcat-8.5-doc/index.html">Tomcat 8.5</a></li><li><a href="./upgrading.html">Upgrading</a></li><li><a href="./connecto rs-doc/">Tomcat Connectors</a></li><li><a href="./native-doc/">Tomcat Native 2</a></li><li><a href="./native-1.2-doc/">Tomcat Native 1.2</a></li><li><a href="https://cwiki.apache.org/confluence/display/TOMCAT";>Wiki</a></li><li><a href="./migration.html">Migration Guide</a></li><li><a href="./presentations.html">Presentations</a></li><li><a href="https://cwiki.apache.org/confluence/x/Bi8lBg";>Specifications</a></li></ul></div><div><h2>Problems?</h2><ul><li><a href="./security.html">Security Reports</a></li><li><a href="./findhelp.html">Find help</a></li><li><a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQ</a></li><li><a href="./lists.html">Mailing Lists</a></li><li><a href="./bugreport.html">Bug Database</a></li><li><a href="./irc.html">IRC</a></li></ul></div><div><h2>Get Involved</h2><ul><li><a href="./getinvolved.html">Overview</a></li><li><a href="./source.html">Source code</a></li><li><a href="./ci.html">Buildbot</a></li><li><a href="https://cwiki.apache.org/co nfluence/x/vIPzBQ">Translations</a></li><li><a href="./tools.html">Tools</a></li></ul></div><div><h2>Media</h2><ul><li><a href="https://twitter.com/theapachetomcat";>Twitter</a></li><li><a href="https://www.youtube.com/c/ApacheTomcatOfficial";>YouTube</a></li><li><a href="https://blogs.apache.org/tomcat/";>Blog</a></li></ul></div><div><h2>Misc</h2><ul><li><a href="./whoweare.html">Who We Are</a></li><li><a href="https://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>Swag</a></li><li><a href="./heritage.html">Heritage</a></li><li><a href="http://www.apache.org";>Apache Home</a></li><li><a href="./resources.html">Resources</a></li><li><a href="./contact.html">Contact</a></li><li><a href="./legal.html">Legal</a></li><li><a href="https://privacy.apache.org/policies/privacy-policy-public.html";>Privacy</a></li><li><a href="https://www.apache.org/foundation/contributing.html";>Support Apache</a></li><li><a href="https://www.apache.org/foundation/sponsorship.html";>Sponsorship</a>< /li><li><a href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li><li><a href="http://www.apache.org/licenses/";>License</a></li></ul></div></nav></div></div><div id="mainRight"><div id="content"><h2 style="display: none;">Content</h2><h3 id="Who_We_Are">Who We Are</h3><div class="text"> <p> -The Apache Tomcat Project operates on a meritocracy: the more you do, +The Apache Tomcat<sup>®</sup> project operates on a meritocracy: the more you do, the more responsibility you will obtain. This page lists all of the people who have gone the extra mile and are Committers or members of the Project Management Committee (PMC). If you would like to help, please Modified: tomcat/site/trunk/xdocs/bugreport.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/bugreport.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/bugreport.xml (original) +++ tomcat/site/trunk/xdocs/bugreport.xml Thu Dec 28 11:15:41 2023 @@ -13,7 +13,7 @@ </section> <section name="Before you report a bug"> -<p>The Apache Tomcat community consists of those who use Apache Tomcat, help answer +<p>The Apache Tomcat<sup>®</sup> community consists of those who use Apache Tomcat, help answer questions on discussions lists, contribute documentation and patches, and those who develop and maintain the code for Apache Tomcat. Almost all those who assist on a day to day basis resolving bug reports do this for a Modified: tomcat/site/trunk/xdocs/ci.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/ci.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/ci.xml (original) +++ tomcat/site/trunk/xdocs/ci.xml Thu Dec 28 11:15:41 2023 @@ -12,7 +12,7 @@ </section> <section name="Overview"> -<p>Apache Tomcat project uses several +<p>Apache Tomcat<sup>®</sup> project uses several <a href="https://ci.apache.org/";>automated build services</a> provided by Apache Software Foundation. In short, those are:</p> Modified: tomcat/site/trunk/xdocs/conference.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/conference.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/conference.xml (original) +++ tomcat/site/trunk/xdocs/conference.xml Thu Dec 28 11:15:41 2023 @@ -9,7 +9,7 @@ <section name="TomcatCon"> -<p>TomcatCon is the place for all users of Tomcat to expand their Tomcat +<p>TomcatCon is the place for all users of Apache Tomcat<sup>®</sup> to expand their Tomcat knowledge in areas such as networking, security, performance and deployment. It also offers an opportunity to discuss the current Tomcat roadmap and help inform future development.</p> Modified: tomcat/site/trunk/xdocs/contact.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/contact.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/contact.xml (original) +++ tomcat/site/trunk/xdocs/contact.xml Thu Dec 28 11:15:41 2023 @@ -9,7 +9,7 @@ <section name="Product Support"> <p> -If you have questions or comments about the software or documentation on this site, +If you have questions or comments about the Apache Tomcat<sup>®</sup> software or documentation on this site, please subscribe to the appropriate <a href="lists.html">mailing list</a>. </p> </section> Modified: tomcat/site/trunk/xdocs/findhelp.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/findhelp.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/findhelp.xml (original) +++ tomcat/site/trunk/xdocs/findhelp.xml Thu Dec 28 11:15:41 2023 @@ -9,7 +9,7 @@ <section name="Find help"> -<p>Apache Tomcat support is provided by the community, for the community, on a +<p>Apache Tomcat<sup>®</sup> support is provided by the community, for the community, on a purely volunteer basis. This page has been written to help you find the help you need whilst making the most efficient use of the resources available. The types of help are presented in the same order they are typically used.</p> Modified: tomcat/site/trunk/xdocs/getinvolved.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/getinvolved.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/getinvolved.xml (original) +++ tomcat/site/trunk/xdocs/getinvolved.xml Thu Dec 28 11:15:41 2023 @@ -10,7 +10,7 @@ <section name="Get Involved"> <p>If you would like to become involved in the development and support of Apache -Tomcat there are many different ways in which you can contribute. The first step +Tomcat<sup>®</sup> there are many different ways in which you can contribute. The first step is to <a href="lists.html">join the mailing lists</a>. The following are just a few areas ways in which you can help:</p> Modified: tomcat/site/trunk/xdocs/heritage.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/heritage.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/heritage.xml (original) +++ tomcat/site/trunk/xdocs/heritage.xml Thu Dec 28 11:15:41 2023 @@ -15,7 +15,7 @@ Java Server Pages Specifications. The site contains all the details of those specifications. </p> <p>The Tomcat code base was donated by Sun to the Apache Software Foundation in 1999, and -the first Apache release was version 3.0. Since then, multiple volunteers from Sun and +the first Apache Tomcat<sup>®</sup> release was version 3.0. Since then, multiple volunteers from Sun and numerous other organizations have contributed to the product. There have been <a href="whichversion.html">multiple major releases</a> and the product has enjoyed considerable industry adoption as well as a healthy and active community. Modified: tomcat/site/trunk/xdocs/irc.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/irc.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/irc.xml (original) +++ tomcat/site/trunk/xdocs/irc.xml Thu Dec 28 11:15:41 2023 @@ -9,7 +9,7 @@ <section name="Apache Tomcat on IRC"> -<p>An IRC channel dedicated to Tomcat exists on libera.chat.</p> +<p>An IRC channel dedicated to Apache Tomcat<sup>®</sup> exists on libera.chat.</p> <p> <code>#tomcat</code> at <code>irc.libera.chat</code>. Modified: tomcat/site/trunk/xdocs/lists.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/lists.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/lists.xml (original) +++ tomcat/site/trunk/xdocs/lists.xml Thu Dec 28 11:15:41 2023 @@ -11,7 +11,7 @@ <section name="Apache Tomcat Mailing Lists"> -<p>Before you can send a message to one of the Tomcat lists, you must subscribe +<p>Before you can send a message to one of the Apache Tomcat<sup>®</sup> lists, you must subscribe to that list. If you try to send a message to a list from an e-mail address that is not subscribed to the list, it will be rejected.</p> Modified: tomcat/site/trunk/xdocs/maven-plugin.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/maven-plugin.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/maven-plugin.xml (original) +++ tomcat/site/trunk/xdocs/maven-plugin.xml Thu Dec 28 11:15:41 2023 @@ -12,7 +12,7 @@ <p> The Apache Tomcat Maven Plugin provides goals to manipulate WAR - projects within the Apache Tomcat servlet container. + projects within the Apache Tomcat<sup>®</sup> servlet container. You can run your War Apache Maven project through <a href="http://maven.apache.org/";>Apache Maven</a> without deploying your WAR file to an Apache Tomcat instance. Modified: tomcat/site/trunk/xdocs/migration-10.1.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-10.1.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/migration-10.1.xml (original) +++ tomcat/site/trunk/xdocs/migration-10.1.xml Thu Dec 28 11:15:41 2023 @@ -16,7 +16,7 @@ <p>Please read the general <a href="migration.html">Migration Guide page</a> first, for common considerations that apply to migration or upgrade between -versions of Apache Tomcat.</p> +versions of Apache Tomcat<sup>®</sup>.</p> </section> Modified: tomcat/site/trunk/xdocs/migration-10.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-10.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/migration-10.xml (original) +++ tomcat/site/trunk/xdocs/migration-10.xml Thu Dec 28 11:15:41 2023 @@ -16,7 +16,7 @@ <p>Please read the general <a href="migration.html">Migration Guide page</a> first, for common considerations that apply to migration or upgrade between -versions of Apache Tomcat.</p> +versions of Apache Tomcat<sup>®</sup>.</p> </section> Modified: tomcat/site/trunk/xdocs/migration-11.0.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-11.0.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/migration-11.0.xml (original) +++ tomcat/site/trunk/xdocs/migration-11.0.xml Thu Dec 28 11:15:41 2023 @@ -16,7 +16,7 @@ <p>Please read the general <a href="migration.html">Migration Guide page</a> first, for common considerations that apply to migration or upgrade between -versions of Apache Tomcat.</p> +versions of Apache Tomcat<sup>®</sup>.</p> </section> Modified: tomcat/site/trunk/xdocs/migration-6.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-6.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/migration-6.xml (original) +++ tomcat/site/trunk/xdocs/migration-6.xml Thu Dec 28 11:15:41 2023 @@ -16,7 +16,7 @@ <p>Please read the general <a href="migration.html">Migration Guide page</a> first, for common considerations that apply to migration or upgrade between -versions of Apache Tomcat.</p> +versions of Apache Tomcat<sup>®</sup>.</p> </section> Modified: tomcat/site/trunk/xdocs/migration-7.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-7.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/migration-7.xml (original) +++ tomcat/site/trunk/xdocs/migration-7.xml Thu Dec 28 11:15:41 2023 @@ -16,7 +16,7 @@ <p>Please read the general <a href="migration.html">Migration Guide page</a> first, for common considerations that apply to migration or upgrade between -versions of Apache Tomcat.</p> +versions of Apache Tomcat<sup>®</sup>.</p> </section> Modified: tomcat/site/trunk/xdocs/migration-8.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-8.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/migration-8.xml (original) +++ tomcat/site/trunk/xdocs/migration-8.xml Thu Dec 28 11:15:41 2023 @@ -16,7 +16,7 @@ <p>Please read the general <a href="migration.html">Migration Guide page</a> first, for common considerations that apply to migration or upgrade between -versions of Apache Tomcat.</p> +versions of Apache Tomcat<sup>®</sup>.</p> </section> Modified: tomcat/site/trunk/xdocs/migration-85.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-85.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/migration-85.xml (original) +++ tomcat/site/trunk/xdocs/migration-85.xml Thu Dec 28 11:15:41 2023 @@ -16,7 +16,7 @@ <p>Please read the general <a href="migration.html">Migration Guide page</a> first, for common considerations that apply to migration or upgrade between -versions of Apache Tomcat.</p> +versions of Apache Tomcat<sup>®</sup>.</p> </section> Modified: tomcat/site/trunk/xdocs/migration-9.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-9.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/migration-9.xml (original) +++ tomcat/site/trunk/xdocs/migration-9.xml Thu Dec 28 11:15:41 2023 @@ -16,7 +16,7 @@ <p>Please read the general <a href="migration.html">Migration Guide page</a> first, for common considerations that apply to migration or upgrade between -versions of Apache Tomcat.</p> +versions of Apache Tomcat<sup>®</sup>.</p> </section> Modified: tomcat/site/trunk/xdocs/migration.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/migration.xml (original) +++ tomcat/site/trunk/xdocs/migration.xml Thu Dec 28 11:15:41 2023 @@ -10,7 +10,7 @@ <section name="Before upgrading or migrating"> -<p>When updating from one major Apache Tomcat version a newer one, please make +<p>When updating from one major Apache Tomcat<sup>®</sup> version a newer one, please make sure that the JVM that is installed on your system supports at least the required Java version. While it is possible that older versions of Tomcat may not be compatible with newer JVMs, all the currently supported Apache Tomcat Modified: tomcat/site/trunk/xdocs/presentations.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/presentations.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/presentations.xml (original) +++ tomcat/site/trunk/xdocs/presentations.xml Thu Dec 28 11:15:41 2023 @@ -9,7 +9,7 @@ <section name="Presentations"> -<p>Apache Tomcat features regularly at ApacheCon and other conferences. Copies +<p>Apache Tomcat<sup>®</sup> features regularly at ApacheCon and other conferences. Copies of many of these presentations are freely available online. This page provides links to these presentations where known. If you are aware of additional presentations then please do let us know via the Modified: tomcat/site/trunk/xdocs/resources.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/resources.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/resources.xml (original) +++ tomcat/site/trunk/xdocs/resources.xml Thu Dec 28 11:15:41 2023 @@ -12,7 +12,7 @@ <p>A <a href="https://cwiki.apache.org/confluence/display/TOMCAT/AddOns";>list of third party tools and add-ons</a> (most of them free) is maintained on the - <a href="https://cwiki.apache.org/confluence/display/TOMCAT";>Apache Tomcat + <a href="https://cwiki.apache.org/confluence/display/TOMCAT";>Apache Tomcat<sup>®</sup> wiki</a>. Please note that the Apache Tomcat project doesn't endorse any of the products listed. If you use or develop a tool or add-on for Apache Tomcat please feel free to add it to the list on the wiki.</p> Modified: tomcat/site/trunk/xdocs/security-10.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-10.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/security-10.xml (original) +++ tomcat/site/trunk/xdocs/security-10.xml Thu Dec 28 11:15:41 2023 @@ -10,7 +10,7 @@ <section name="Apache Tomcat 10.x vulnerabilities"> <p>This page lists all security vulnerabilities fixed in released versions - of Apache Tomcat 10.x. Each vulnerability is given a + of Apache Tomcat<sup>®</sup> 10.x. Each vulnerability is given a <a href="security-impact.html">security impact rating</a> by the Apache Tomcat security team — please note that this rating may vary from platform to platform. We also list the versions of Apache Tomcat the flaw Modified: tomcat/site/trunk/xdocs/security-11.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-11.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/security-11.xml (original) +++ tomcat/site/trunk/xdocs/security-11.xml Thu Dec 28 11:15:41 2023 @@ -10,7 +10,7 @@ <section name="Apache Tomcat 11.x vulnerabilities"> <p>This page lists all security vulnerabilities fixed in released versions - of Apache Tomcat 11.x. Each vulnerability is given a + of Apache Tomcat<sup>®</sup> 11.x. Each vulnerability is given a <a href="security-impact.html">security impact rating</a> by the Apache Tomcat security team — please note that this rating may vary from platform to platform. We also list the versions of Apache Tomcat the flaw Modified: tomcat/site/trunk/xdocs/security-3.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-3.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/security-3.xml (original) +++ tomcat/site/trunk/xdocs/security-3.xml Thu Dec 28 11:15:41 2023 @@ -10,7 +10,7 @@ <section name="Apache Tomcat 3.x vulnerabilities"> <p>This page lists all security vulnerabilities fixed in released versions - of Apache Tomcat 3.x. Each vulnerability is given a + of Apache Tomcat<sup>®</sup> 3.x. Each vulnerability is given a <a href="security-impact.html">security impact rating</a> by the Apache Tomcat security team — please note that this rating may vary from platform to platform. We also list the versions of Apache Tomcat the flaw Modified: tomcat/site/trunk/xdocs/security-4.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-4.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/security-4.xml (original) +++ tomcat/site/trunk/xdocs/security-4.xml Thu Dec 28 11:15:41 2023 @@ -10,7 +10,7 @@ <section name="Apache Tomcat 4.x vulnerabilities"> <p>This page lists all security vulnerabilities fixed in released versions - of Apache Tomcat 4.x. Each vulnerability is given a + of Apache Tomcat<sup>®</sup> 4.x. Each vulnerability is given a <a href="security-impact.html">security impact rating</a> by the Apache Tomcat security team — please note that this rating may vary from platform to platform. We also list the versions of Apache Tomcat the flaw Modified: tomcat/site/trunk/xdocs/security-5.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-5.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/security-5.xml (original) +++ tomcat/site/trunk/xdocs/security-5.xml Thu Dec 28 11:15:41 2023 @@ -10,7 +10,7 @@ <section name="Apache Tomcat 5.x vulnerabilities"> <p>This page lists all security vulnerabilities fixed in released versions - of Apache Tomcat 5.x. Each vulnerability is given a + of Apache Tomcat<sup>®</sup> 5.x. Each vulnerability is given a <a href="security-impact.html">security impact rating</a> by the Apache Tomcat security team — please note that this rating may vary from platform to platform. We also list the versions of Apache Tomcat the flaw Modified: tomcat/site/trunk/xdocs/security-6.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-6.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/security-6.xml (original) +++ tomcat/site/trunk/xdocs/security-6.xml Thu Dec 28 11:15:41 2023 @@ -10,7 +10,7 @@ <section name="Apache Tomcat 6.x vulnerabilities"> <p>This page lists all security vulnerabilities fixed in released versions - of Apache Tomcat 6.x. Each vulnerability is given a + of Apache Tomcat<sup>®</sup> 6.x. Each vulnerability is given a <a href="security-impact.html">security impact rating</a> by the Apache Tomcat security team — please note that this rating may vary from platform to platform. We also list the versions of Apache Tomcat the flaw Modified: tomcat/site/trunk/xdocs/security-7.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-7.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/security-7.xml (original) +++ tomcat/site/trunk/xdocs/security-7.xml Thu Dec 28 11:15:41 2023 @@ -10,7 +10,7 @@ <section name="Apache Tomcat 7.x vulnerabilities"> <p>This page lists all security vulnerabilities fixed in released versions - of Apache Tomcat 7.x. Each vulnerability is given a + of Apache Tomcat<sup>®</sup> 7.x. Each vulnerability is given a <a href="security-impact.html">security impact rating</a> by the Apache Tomcat security team — please note that this rating may vary from platform to platform. We also list the versions of Apache Tomcat the flaw Modified: tomcat/site/trunk/xdocs/security-8.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-8.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/security-8.xml (original) +++ tomcat/site/trunk/xdocs/security-8.xml Thu Dec 28 11:15:41 2023 @@ -10,7 +10,7 @@ <section name="Apache Tomcat 8.x vulnerabilities"> <p>This page lists all security vulnerabilities fixed in released versions - of Apache Tomcat 8.x. Each vulnerability is given a + of Apache Tomcat<sup>®</sup> 8.x. Each vulnerability is given a <a href="security-impact.html">security impact rating</a> by the Apache Tomcat security team — please note that this rating may vary from platform to platform. We also list the versions of Apache Tomcat the flaw Modified: tomcat/site/trunk/xdocs/security-9.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-9.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/security-9.xml (original) +++ tomcat/site/trunk/xdocs/security-9.xml Thu Dec 28 11:15:41 2023 @@ -10,7 +10,7 @@ <section name="Apache Tomcat 9.x vulnerabilities"> <p>This page lists all security vulnerabilities fixed in released versions - of Apache Tomcat 9.x. Each vulnerability is given a + of Apache Tomcat<sup>®</sup> 9.x. Each vulnerability is given a <a href="security-impact.html">security impact rating</a> by the Apache Tomcat security team — please note that this rating may vary from platform to platform. We also list the versions of Apache Tomcat the flaw Modified: tomcat/site/trunk/xdocs/security-impact.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-impact.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/security-impact.xml (original) +++ tomcat/site/trunk/xdocs/security-impact.xml Thu Dec 28 11:15:41 2023 @@ -8,7 +8,7 @@ <body> <section name="Summary of security impact levels for Apache Tomcat"> - <p>The Apache Tomcat Security Team rates the impact of each security flaw + <p>The Apache Tomcat<sup>®</sup> Security Team rates the impact of each security flaw that affects Tomcat. We've chosen a rating scale quite similar to those used by other major vendors in order to be consistent. Basically the goal of the rating system is to answer the question "How worried should I be Modified: tomcat/site/trunk/xdocs/security-jk.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-jk.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/security-jk.xml (original) +++ tomcat/site/trunk/xdocs/security-jk.xml Thu Dec 28 11:15:41 2023 @@ -16,7 +16,7 @@ <p>This page lists all security vulnerabilities fixed in released versions of Apache Tomcat Jk Connectors. Each vulnerability is given a <a href="security-impact.html">security impact rating</a> by the Apache - Tomcat security team — please note that this rating may vary from + Tomcat<sup>®</sup> security team — please note that this rating may vary from platform to platform. We also list the versions of Apache Tomcat JK Connectors the flaw is known to affect, and where a flaw has not been verified list the version with a question mark.</p> Modified: tomcat/site/trunk/xdocs/security-native.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-native.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/security-native.xml (original) +++ tomcat/site/trunk/xdocs/security-native.xml Thu Dec 28 11:15:41 2023 @@ -16,7 +16,7 @@ <p>This page lists all security vulnerabilities fixed in released versions of Apache Tomcat APR/native Connector. Each vulnerability is given a <a href="security-impact.html">security impact rating</a> by the Apache - Tomcat security team — please note that this rating may vary from + Tomcat<sup>®</sup> security team — please note that this rating may vary from platform to platform. We also list the versions of Apache Tomcat APR/native Connectors the flaw is known to affect, and where a flaw has not been verified list the version with a question mark.</p> Modified: tomcat/site/trunk/xdocs/security-taglibs.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-taglibs.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/security-taglibs.xml (original) +++ tomcat/site/trunk/xdocs/security-taglibs.xml Thu Dec 28 11:15:41 2023 @@ -16,7 +16,7 @@ <p>This page lists all security vulnerabilities fixed in released versions of Apache Taglibs. Each vulnerability is given a <a href="security-impact.html">security impact rating</a> by the Apache - Tomcat security team — please note that this rating may vary from + Tomcat<sup>®</sup> security team — please note that this rating may vary from platform to platform. We also list the versions of Apache Taglibs the flaw is known to affect, and where a flaw has not been verified list the version with a question mark.</p> Modified: tomcat/site/trunk/xdocs/security.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/security.xml (original) +++ tomcat/site/trunk/xdocs/security.xml Thu Dec 28 11:15:41 2023 @@ -11,7 +11,7 @@ <p>Please note that, except in rare circumstances, binary patches are not produced for individual vulnerabilities. To obtain the binary fix for a - particular vulnerability you should upgrade to an Apache Tomcat version + particular vulnerability you should upgrade to an Apache Tomcat<sup>®</sup> version where that vulnerability has been fixed.</p> <p>Source patches, usually in the form of references to commits, may be Modified: tomcat/site/trunk/xdocs/source.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/source.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/source.xml (original) +++ tomcat/site/trunk/xdocs/source.xml Thu Dec 28 11:15:41 2023 @@ -13,7 +13,7 @@ <section name="Version Control"> -<p>The Apache Tomcat project is in the process of migrating from Subversion to +<p>The Apache Tomcat<sup>®</sup> project is in the process of migrating from Subversion to Git for version control. The following components use Git: </p> <ul> Modified: tomcat/site/trunk/xdocs/tomcat-10.0-eol.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/tomcat-10.0-eol.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/tomcat-10.0-eol.xml (original) +++ tomcat/site/trunk/xdocs/tomcat-10.0-eol.xml Thu Dec 28 11:15:41 2023 @@ -9,7 +9,7 @@ <body> <section name="End of life for Apache Tomcat 10.0.x" rtext="2022-10-31"> -<p>The Apache Tomcat team announces that support for Apache Tomcat 10.0.x +<p>The Apache Tomcat<sup>®</sup> team announces that support for Apache Tomcat 10.0.x ended on 31 October 2022.</p> <p>This means that after 31 October 2022:</p> Modified: tomcat/site/trunk/xdocs/tomcat-55-eol.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/tomcat-55-eol.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/tomcat-55-eol.xml (original) +++ tomcat/site/trunk/xdocs/tomcat-55-eol.xml Thu Dec 28 11:15:41 2023 @@ -9,7 +9,7 @@ <body> <section name="End of life for Apache Tomcat 5.5.x" rtext="2011-08-10"> -<p>The Apache Tomcat team announces that support for Apache Tomcat 5.5.x +<p>The Apache Tomcat<sup>®</sup> team announces that support for Apache Tomcat 5.5.x will end on 30 September 2012.</p> <p>This means that after 30 September 2012:</p> Modified: tomcat/site/trunk/xdocs/tomcat-60-eol.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/tomcat-60-eol.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/tomcat-60-eol.xml (original) +++ tomcat/site/trunk/xdocs/tomcat-60-eol.xml Thu Dec 28 11:15:41 2023 @@ -9,7 +9,7 @@ <body> <section name="End of life for Apache Tomcat 6.0.x" rtext="2015-06-03"> -<p>The Apache Tomcat team announces that support for Apache Tomcat 6.0.x +<p>The Apache Tomcat<sup>®</sup> team announces that support for Apache Tomcat 6.0.x will end on 31 December 2016.</p> <p>This means that after 31 December 2016:</p> Modified: tomcat/site/trunk/xdocs/tomcat-70-eol.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/tomcat-70-eol.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/tomcat-70-eol.xml (original) +++ tomcat/site/trunk/xdocs/tomcat-70-eol.xml Thu Dec 28 11:15:41 2023 @@ -9,7 +9,7 @@ <body> <section name="End of life for Apache Tomcat 7.0.x" rtext="2020-03-02"> -<p>The Apache Tomcat team announces that support for Apache Tomcat 7.0.x +<p>The Apache Tomcat<sup>®</sup> team announces that support for Apache Tomcat 7.0.x will end on 31 March 2021.</p> <p>This means that after 31 March 2021:</p> Modified: tomcat/site/trunk/xdocs/tomcat-80-eol.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/tomcat-80-eol.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/tomcat-80-eol.xml (original) +++ tomcat/site/trunk/xdocs/tomcat-80-eol.xml Thu Dec 28 11:15:41 2023 @@ -9,7 +9,7 @@ <body> <section name="End of life for Apache Tomcat 8.0.x" rtext="2017-06-30"> -<p>The Apache Tomcat team announces that support for Apache Tomcat 8.0.x +<p>The Apache Tomcat<sup>®</sup> team announces that support for Apache Tomcat 8.0.x will end on 30 June 2018.</p> <p>This means that after 30 June 2018:</p> Modified: tomcat/site/trunk/xdocs/tomcat-85-eol.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/tomcat-85-eol.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/tomcat-85-eol.xml (original) +++ tomcat/site/trunk/xdocs/tomcat-85-eol.xml Thu Dec 28 11:15:41 2023 @@ -9,7 +9,7 @@ <body> <section name="End of life for Apache Tomcat 8.5.x" rtext="2022-12-13"> -<p>The Apache Tomcat team announces that support for Apache Tomcat 8.5.x +<p>The Apache Tomcat<sup>®</sup> team announces that support for Apache Tomcat 8.5.x will end on 31 March 2024.</p> <p>This means that after 31 March 2024:</p> Modified: tomcat/site/trunk/xdocs/tools.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/tools.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/tools.xml (original) +++ tomcat/site/trunk/xdocs/tools.xml Thu Dec 28 11:15:41 2023 @@ -13,7 +13,7 @@ </section> <section name="Overview"> -<p>This page lists the various tools that the Apache Tomcat project uses. Not +<p>This page lists the various tools that the Apache Tomcat<sup>®</sup> project uses. Not all developers use every tool. There are almost certainly some tools that are missing. If you are a committer, you know how to fix this. If you are not a committer, send a short note to the <a href="lists.html#tomcat-dev">developer Modified: tomcat/site/trunk/xdocs/upgrading.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/upgrading.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/upgrading.xml (original) +++ tomcat/site/trunk/xdocs/upgrading.xml Thu Dec 28 11:15:41 2023 @@ -10,7 +10,7 @@ <body> <section name="Overview"> - Upgrading Apache Tomcat can be straightforward or complicated, depending + Upgrading Apache Tomcat<sup>®</sup> can be straightforward or complicated, depending upon the complexity of your environment. This document explains some of the basics of upgrading Apache Tomcat and can be used as a starting point for you to establish your own environment-specific upgrade plans and procedures. Modified: tomcat/site/trunk/xdocs/whoweare.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whoweare.xml?rev=1914965&r1=1914964&r2=1914965&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/whoweare.xml (original) +++ tomcat/site/trunk/xdocs/whoweare.xml Thu Dec 28 11:15:41 2023 @@ -9,7 +9,7 @@ <section name="Who We Are"> <p> -The Apache Tomcat Project operates on a meritocracy: the more you do, +The Apache Tomcat<sup>®</sup> project operates on a meritocracy: the more you do, the more responsibility you will obtain. This page lists all of the people who have gone the extra mile and are Committers or members of the Project Management Committee (PMC). If you would like to help, please --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
![https://www.apache.org/images/SupportApache-small.png"](https://www.apache.org/images/SupportApache-small.png"){kind=link}