Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1873980&r1=1873979&r2=1873980&view=diff ============================================================================== --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Thu Feb 13 15:24:17 2020 @@ -1,220 +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® - Welcome!</title> -<meta name="author" content="Apache Tomcat Project"> -<meta name="google-site-verification" content="nA9F0GvGNjVCU9W7HBziONQVx6FehvgQglI1X7WPfRw"> -</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 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 href="https://www.apache.org/events/current-event.html";><img src="https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF event"><br> +<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® - Welcome!</title><meta name="author" content="Apache Tomcat Project"><meta name="google-site-verification" content="nA9F0GvGNjVCU9W7HBziONQVx6FehvgQglI1X7WPfRw"></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/Suppo rtApache-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 href="https://www.apache.org/events/current-event.html";><img src="https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF event"><br> Save the date! - </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-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-70.cgi";>Tomcat 7</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-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="./tomcat-7.0-doc/index.html">Tomcat 7.0</a> -</li> -<li> -<a href="./connectors-doc/">Tomcat Connectors</a> -</li> -<li> -<a href="./native-doc/">Tomcat Native</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> -</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://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="Apache_Tomcat">Apache Tomcat</h3> -<div class="text"> - + </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-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-70.cgi";>Tomcat 7</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-9.0-doc/index.html">Tomcat 9.0</a></li><li><a href="./tomcat-8.5-doc/index.html">Tomcat 8.5</a></li><l i><a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a></li><li><a href="./connectors-doc/">Tomcat Connectors</a></li><li><a href="./native-doc/">Tomcat Native</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></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://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="Apache_Tomcat">Apache Tomcat</h3><div class="text"> <p>The Apache Tomcat<sup>®</sup> software is an open source implementation of the Java Servlet, JavaServer Pages, Java Expression Language and Java @@ -224,7 +11,6 @@ Language and Java WebSocket specificatio Process</a>. </p> - <p>The Apache Tomcat software is developed in an open and participatory environment and released under the <a href="http://www.apache.org/licenses/";>Apache License version 2</a>. The @@ -233,253 +19,150 @@ developers from around the world. We in development project. To learn more about getting involved, <a href="getinvolved.html">click here</a>.</p> - <p>Apache Tomcat software powers numerous large-scale, mission-critical web applications across a diverse range of industries and organizations. Some of these users and their stories are listed on the <a href="https://cwiki.apache.org/confluence/display/TOMCAT/PoweredBy";>PoweredBy</a> wiki page.</p> - <p>Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat project logo are trademarks of the Apache Software Foundation.</p> - -</div> -<h3 id="Tomcat_9.0.31_Released"> -<span class="pull-right">2020-02-11</span> Tomcat 9.0.31 Released</h3> -<div class="text"> - +</div><h3 id="Tomcat_9.0.31_Released"><span class="pull-right">2020-02-11</span> Tomcat 9.0.31 Released</h3><div class="text"> <p> The Apache Tomcat Project is proud to announce the release of version 9.0.31 of Apache Tomcat. The notable changes compared to 9.0.30 include:</p> - <ul> - <li>AJP defaults changed to listen the loopback address, require a secret and to be disabled in the sample server.xml</li> - <li>The JmxRemoteLifecycleListener is now deprecated</li> - <li>The HTTP Connector attribute rejectIllegalHeaderName is renamed to rejectIllegalHeader and expanded to include header values as well as names</li> - </ul> - <p> Full details of these changes, and all the other changes, are available in the <a href="tomcat-9.0-doc/changelog.html#Tomcat_9.0.31_(markt)">Tomcat 9 changelog</a>. </p> - <p style="text-align: center;"> - <a href="https://tomcat.apache.org/download-90.cgi";>Download</a> - </p> - -</div> -<h3 id="Tomcat_8.5.51_Released"> -<span class="pull-right">2020-02-11</span> Tomcat 8.5.51 Released</h3> -<div class="text"> - +</div><h3 id="Tomcat_8.5.51_Released"><span class="pull-right">2020-02-11</span> Tomcat 8.5.51 Released</h3><div class="text"> <p> The Apache Tomcat Project is proud to announce the release of version 8.5.50 of Apache Tomcat. Apache Tomcat 8.5.x replaces 8.0.x and includes new features pulled forward from Tomcat 9.0.x. The minimum Java version and implemented specification versions remain unchanged. The notable changes compared to 8.5.49 include:</p> - <ul> - <li>AJP defaults changed to listen the loopback address, require a secret and to be disabled in the sample server.xml</li> - <li>The JmxRemoteLifecycleListener is now deprecated</li> - <li>The HTTP Connector attribute rejectIllegalHeaderName is renamed to rejectIllegalHeader and expanded to include header values as well as names</li> - </ul> - <p> Full details of these changes, and all the other changes, are available in the <a href="tomcat-8.5-doc/changelog.html#Tomcat_8.5.51_(markt)">Tomcat 8.5 changelog</a>. </p> - <p style="text-align: center;"> - <a href="https://tomcat.apache.org/download-80.cgi";>Download</a> - </p> - -</div> -<h3 id="Tomcat_7.0.99_Released"> -<span class="pull-right">2019-12-17</span> Tomcat 7.0.99 Released</h3> -<div class="text"> - +</div><h3 id="Tomcat_7.0.99_Released"><span class="pull-right">2019-12-17</span> Tomcat 7.0.99 Released</h3><div class="text"> <p> The Apache Tomcat Project is proud to announce the release of version 7.0.99 of Apache Tomcat. This release contains a number of bug fixes and improvements compared to version 7.0.96.</p> - <p> Full details of these changes, and all the other changes, are available in the <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.99_(violetagg)">Tomcat 7 changelog</a>. </p> - <p style="text-align: center;"> - <a href="https://tomcat.apache.org/download-70.cgi";>Download</a> - </p> - -</div> -<h3 id="Tomcat_Native_1.2.23_Released"> -<span class="pull-right">2019-07-02</span> Tomcat Native 1.2.23 Released</h3> -<div class="text"> - +</div><h3 id="Tomcat_Native_1.2.23_Released"><span class="pull-right">2019-07-02</span> Tomcat Native 1.2.23 Released</h3><div class="text"> <p> The Apache Tomcat Project is proud to announce the release of version 1.2.23 of Tomcat Native. The notable changes since 1.2.21 include: </p> - <ul> - -<li>Add support for TLS key logging when using OpenSSL 1.1.1 or later.</li> - -<li>Fix crashes when a CRL file or path is configured.</li> - -<li>Update Windows binaries to APR 1.7.0 and OpenSSL 1.1.1c.</li> - + <li>Add support for TLS key logging when using OpenSSL 1.1.1 or later.</li> + <li>Fix crashes when a CRL file or path is configured.</li> + <li>Update Windows binaries to APR 1.7.0 and OpenSSL 1.1.1c.</li> </ul> - <p style="text-align: center;"> - <a href="https://tomcat.apache.org/download-native.cgi";>Download</a> | <a href="native-doc/miscellaneous/changelog.html">ChangeLog for 1.2.23</a> - </p> - -</div> -<h3 id="Tomcat_Connectors_1.2.46_Released"> -<span class="pull-right">2018-10-13</span> Tomcat Connectors 1.2.46 Released</h3> -<div class="text"> - +</div><h3 id="Tomcat_Connectors_1.2.46_Released"><span class="pull-right">2018-10-13</span> Tomcat Connectors 1.2.46 Released</h3><div class="text"> <p> The Apache Tomcat Project is proud to announce the release of version 1.2.46 of Apache Tomcat Connectors. This version fixes a number of bugs found in previous releases. </p> - <p style="text-align: center;"> - <a href="https://tomcat.apache.org/download-connectors.cgi";>Download</a> | <a href="connectors-doc/miscellaneous/changelog.html">ChangeLog for 1.2.46</a> - </p> - -</div> -<h3 id="Apache_Standard_Taglib_1.2.5_Released"> -<span class="pull-right">2015-03-17</span> Apache Standard Taglib 1.2.5 Released</h3> -<div class="text"> - +</div><h3 id="Apache_Standard_Taglib_1.2.5_Released"><span class="pull-right">2015-03-17</span> Apache Standard Taglib 1.2.5 Released</h3><div class="text"> <p> The Apache Tomcat Project is proud to announce the release of version 1.2.5 of the Standard Taglib. This tag library provides Apache's implementation of the JSTL 1.2 specification. </p> - <p> Version 1.2.5 is a minor bug fix release reverting a change made in 1.2.1 where <c:import> modified the HTTP method during POST operations, and fixing an issues that resulted in an AccessControlException during startup unless permission was granted to read the accessExternalEntity property. </p> - <p> Please see the <a href="taglibs.html">Taglibs section</a> for more details. </p> - <p style="text-align: center;"> - <a href="https://tomcat.apache.org/download-taglibs.cgi";>Download</a> | <a href="taglibs/CHANGES.txt">Changes</a> - </p> - -</div> -<h3 id="Tomcat_Maven_Plugin_2.2_Released"> -<span class="pull-right">2013-11-11</span> Tomcat Maven Plugin 2.2 Released</h3> -<div class="text"> - +</div><h3 id="Tomcat_Maven_Plugin_2.2_Released"><span class="pull-right">2013-11-11</span> Tomcat Maven Plugin 2.2 Released</h3><div class="text"> <p> The Apache Tomcat team is pleased to announce the release of Tomcat Maven Plugin 2.2. Changelog available <a href="maven-plugin-2.2/jira-report.html" target="_blank">here</a>. </p> - <p> The <a href="maven-plugin.html">Apache Tomcat Maven Plugin</a> provides goals to manipulate WAR projects within the Apache Tomcat servlet container. </p> - <p> The binaries are available from Maven repositories. You should specify the version in your project's plugin configuration: </p> - -<div class="codeBox"> -<pre> -<code><plugin> +<div class="codeBox"><pre><code><plugin> <groupId>org.apache.tomcat.maven</groupId> <artifactId>tomcat7-maven-plugin</artifactId> <version>2.2</version> -</plugin></code> -</pre> -</div> - +</plugin></code></pre></div> <p>or</p> - -<div class="codeBox"> -<pre> -<code><plugin> +<div class="codeBox"><pre><code><plugin> <groupId>org.apache.tomcat.maven</groupId> <artifactId>tomcat6-maven-plugin</artifactId> <version>2.2</version> -</plugin></code> -</pre> -</div> - -</div> -<h3 id="Old_news">Old news</h3> -<div class="text"> - +</plugin></code></pre></div> +</div><h3 id="Old_news">Old news</h3><div class="text"> <p> See <a href="oldnews.html"> former announcements.</a> - </p> - -</div> -</div> -</div> -</div> -</main> -<footer id="footer"> +</div></div></div></div></main><footer id="footer"> Copyright © 1999-2020, 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. - </footer> -</div> -<script src="res/js/tomcat.js"></script> -</body> -</html> + </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=1873980&r1=1873979&r2=1873980&view=diff ============================================================================== --- tomcat/site/trunk/docs/irc.html (original) +++ tomcat/site/trunk/docs/irc.html Thu Feb 13 15:24:17 2020 @@ -1,248 +1,21 @@ <!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® - Apache Tomcat on IRC</title> - <meta name="author" content="Marc A. Saegesser"> - </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 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 href="https://www.apache.org/events/current-event.html";><img src="https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF event"> - <br> - Save the date! - </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-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-70.cgi";>Tomcat 7</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-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="./tomcat-7.0-doc/index.html">Tomcat 7.0</a> - </li> - <li> - <a href="./connectors-doc/">Tomcat Connectors</a> - </li> - <li> - <a href="./native-doc/">Tomcat Native</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> - </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://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="Apache_Tomcat_on_IRC">Apache Tomcat on IRC</h3> - <div class="text"> - - <p>An IRC channel dedicated to Tomcat exists on Freenode.net.</p> - +<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® - Apache Tomcat on IRC</title><meta name="author" content="Marc A. Saegesser"></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 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 href="https://www.apache.org/events/current-event.html";><img src="https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF event"><br> + Save the date! + </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-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-70.cgi";>Tomcat 7</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-9.0-doc/index.html">Tomcat 9.0</a></li><li><a href="./tomcat-8.5-doc/index.html">Tomcat 8.5</a></li><l i><a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a></li><li><a href="./connectors-doc/">Tomcat Connectors</a></li><li><a href="./native-doc/">Tomcat Native</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></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://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="Apache_Tomcat_on_IRC">Apache Tomcat on IRC</h3><div class="text"> +<p>An IRC channel dedicated to Tomcat exists on Freenode.net.</p> - <p> - <code>#tomcat</code> at <code>irc.freenode.net</code>. +<p> + <code>#tomcat</code> at <code>irc.freenode.net</code>. Click <a href="http://webchat.freenode.net/?channels=tomcat"; rel="nofollow"> here</a> to begin using freenode in your browser via freenode's webchat server. +</p> - </p> - - </div> - </div> - </div> - </div> - </main> - <footer id="footer"> - Copyright © 1999-2020, The Apache Software Foundation - - <br> - Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat +</div></div></div></div></main><footer id="footer"> + Copyright © 1999-2020, 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. - - </footer> - </div> - <script src="res/js/tomcat.js"></script> - </body> -</html> + </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=1873980&r1=1873979&r2=1873980&view=diff ============================================================================== --- tomcat/site/trunk/docs/legal.html (original) +++ tomcat/site/trunk/docs/legal.html Thu Feb 13 15:24:17 2020 @@ -1,227 +1,14 @@ <!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® - Legal Stuff They Make Us Say</title> - <meta name="author" content="Apache Tomcat Project"> - </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 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 href="https://www.apache.org/events/current-event.html";><img src="https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF event"> - <br> - Save the date! - </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-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-70.cgi";>Tomcat 7</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-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="./tomcat-7.0-doc/index.html">Tomcat 7.0</a> - </li> - <li> - <a href="./connectors-doc/">Tomcat Connectors</a> - </li> - <li> - <a href="./native-doc/">Tomcat Native</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> - </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://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="Legal_Stuff_They_Make_Us_Say">Legal Stuff They Make Us Say</h3> - <div class="text"> - - <p> +<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® - Legal Stuff They Make Us Say</title><meta name="author" content="Apache Tomcat Project"></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 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 href="https://www.apache.org/events/current-event.html";><img src="https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF event"><br> + Save the date! + </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-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-70.cgi";>Tomcat 7</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-9.0-doc/index.html">Tomcat 9.0</a></li><li><a href="./tomcat-8.5-doc/index.html">Tomcat 8.5</a></li><l i><a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a></li><li><a href="./connectors-doc/">Tomcat Connectors</a></li><li><a href="./native-doc/">Tomcat Native</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></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://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="Legal_Stuff_They_Make_Us_Say">Legal Stuff They Make Us Say</h3><div class="text"> + +<p> All material on this website is Copyright © 1999-2020, The Apache Software Foundation </p> - - <p> + +<p> Sun, Sun Microsystems, Solaris, Java and JavaServer Pages are trademarks or registered trademarks of Oracle Corporation. UNIX is a registered trademark in the United States and other countries, exclusively licensed through 'The Open @@ -230,76 +17,46 @@ Microsoft Corporation. Linux is a regist All other product names mentioned herein and throughout the entire web site are trademarks of their respective owners. </p> - - </div> - <h3 id="The_Apache_License">The Apache License</h3> - <div class="text"> - - <p> - All software produced by The Apache Software Foundation or any of its + + </div><h3 id="The_Apache_License">The Apache License</h3><div class="text"> + +<p> +All software produced by The Apache Software Foundation or any of its projects or subjects is licensed according to the terms of <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version 2.0 (current)</a>. +</p> - </p> - - </div> - <h3 id="Trademarks">Trademarks</h3> - <div class="text"> - - <p> - "Tomcat" is a registered trademark of the Apache Software Foundation. + </div><h3 id="Trademarks">Trademarks</h3><div class="text"> + <p>"Tomcat" is a registered trademark of the Apache Software Foundation. "Apache Tomcat" and the Apache Tomcat project logo are trademarks of the Apache Software Foundation. Use of these trademarks is subject to the terms of section 6 of <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version 2.0 (current)</a> and the <a href="http://www.apache.org/foundation/marks/#guidelines";>ASF branding - guidelines</a>. - </p> - - <p>If you create a product that uses Apache Tomcat software or provides + guidelines</a>.</p> + + <p>If you create a product that uses Apache Tomcat software or provides additional functionality to that software then:</p> - - <ul> - - <li>When referring to Apache Tomcat software, please use the full name + <ul> + <li>When referring to Apache Tomcat software, please use the full name of "Apache Tomcat" for at least the first reference on any web page, help file or similar. Subsequent references may refer to "Tomcat". </li> - - <li> - You may use the + <li>You may use the <a href="//www.apache.org/foundation/press/kit/poweredBy/pb-tomcat.jpg"> - Powered by Tomcat logo</a>. - </li> - - <li> - You may not use the <a href="//www.apache.org/logos/#tomcat">Tomcat - logo</a> without the permission of the Apache Tomcat PMC. - </li> - - <li>If you use the words "Tomcat" or "Apache" in your product name then + Powered by Tomcat logo</a>.</li> + <li>You may not use the <a href="//www.apache.org/logos/#tomcat">Tomcat + logo</a> without the permission of the Apache Tomcat PMC.</li> + <li>If you use the words "Tomcat" or "Apache" in your product name then you must call your product "... for Apache Tomcat". No other form of product name that includes "Tomcat" or "Apache" is permitted.</li> - - </ul> - - </div> - </div> - </div> - </div> - </main> - <footer id="footer"> - Copyright © 1999-2020, The Apache Software Foundation - - <br> - Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat + </ul> + </div></div></div></div></main><footer id="footer"> + Copyright © 1999-2020, 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. - - </footer> - </div> - <script src="res/js/tomcat.js"></script> - </body> -</html> + </footer></div><script src="res/js/tomcat.js"></script></body></html> \ No newline at end of file --------------------------------------------------------------------- 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}
![https://www.apache.org/events/current-event-234x60.png"](https://www.apache.org/events/current-event-234x60.png"){kind=link}