You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2016/04/14 10:38:52 UTC

svn commit: r1739035 - in /tomcat/site/trunk: docs/ xdocs/ xdocs/stylesheets/

Author: markt
Date: Thu Apr 14 08:38:51 2016
New Revision: 1739035

URL: http://svn.apache.org/viewvc?rev=1739035&view=rev
Log:
Add (r) to title and main heading
Insert "software" a few key places on the download pages

Modified:
    tomcat/site/trunk/docs/bugreport.html
    tomcat/site/trunk/docs/ci.html
    tomcat/site/trunk/docs/contact.html
    tomcat/site/trunk/docs/download-60.html
    tomcat/site/trunk/docs/download-70.html
    tomcat/site/trunk/docs/download-80.html
    tomcat/site/trunk/docs/download-90.html
    tomcat/site/trunk/docs/download-connectors.html
    tomcat/site/trunk/docs/download-native.html
    tomcat/site/trunk/docs/download-taglibs.html
    tomcat/site/trunk/docs/findhelp.html
    tomcat/site/trunk/docs/getinvolved.html
    tomcat/site/trunk/docs/heritage.html
    tomcat/site/trunk/docs/index.html
    tomcat/site/trunk/docs/irc.html
    tomcat/site/trunk/docs/legal.html
    tomcat/site/trunk/docs/lists.html
    tomcat/site/trunk/docs/maven-plugin.html
    tomcat/site/trunk/docs/migration-6.html
    tomcat/site/trunk/docs/migration-7.html
    tomcat/site/trunk/docs/migration-8.html
    tomcat/site/trunk/docs/migration-85.html
    tomcat/site/trunk/docs/migration-9.html
    tomcat/site/trunk/docs/migration.html
    tomcat/site/trunk/docs/oldnews-2010.html
    tomcat/site/trunk/docs/oldnews-2011.html
    tomcat/site/trunk/docs/oldnews-2012.html
    tomcat/site/trunk/docs/oldnews-2013.html
    tomcat/site/trunk/docs/oldnews-2014.html
    tomcat/site/trunk/docs/oldnews-2015.html
    tomcat/site/trunk/docs/oldnews.html
    tomcat/site/trunk/docs/presentations.html
    tomcat/site/trunk/docs/resources.html
    tomcat/site/trunk/docs/security-3.html
    tomcat/site/trunk/docs/security-4.html
    tomcat/site/trunk/docs/security-5.html
    tomcat/site/trunk/docs/security-6.html
    tomcat/site/trunk/docs/security-7.html
    tomcat/site/trunk/docs/security-8.html
    tomcat/site/trunk/docs/security-9.html
    tomcat/site/trunk/docs/security-impact.html
    tomcat/site/trunk/docs/security-jk.html
    tomcat/site/trunk/docs/security-native.html
    tomcat/site/trunk/docs/security-taglibs.html
    tomcat/site/trunk/docs/security.html
    tomcat/site/trunk/docs/svn.html
    tomcat/site/trunk/docs/taglibs.html
    tomcat/site/trunk/docs/tomcat-55-eol.html
    tomcat/site/trunk/docs/tomcat-60-eol.html
    tomcat/site/trunk/docs/tools.html
    tomcat/site/trunk/docs/whichversion.html
    tomcat/site/trunk/docs/whoweare.html
    tomcat/site/trunk/xdocs/download-60.xml
    tomcat/site/trunk/xdocs/download-70.xml
    tomcat/site/trunk/xdocs/download-80.xml
    tomcat/site/trunk/xdocs/download-90.xml
    tomcat/site/trunk/xdocs/index.xml
    tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl

Modified: tomcat/site/trunk/docs/bugreport.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/bugreport.html (original)
+++ tomcat/site/trunk/docs/bugreport.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Reporting Bugs</title>
+<title>Apache Tomcat&reg; - Reporting Bugs</title>
 <meta name="author" content="Glenn L. Nielsen">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/ci.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/ci.html (original)
+++ tomcat/site/trunk/docs/ci.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Continuous Integration</title>
+<title>Apache Tomcat&reg; - Continuous Integration</title>
 </head>
 <body>
 <div id="wrapper">
@@ -18,7 +18,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/contact.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/contact.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/contact.html (original)
+++ tomcat/site/trunk/docs/contact.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Contact Information</title>
+<title>Apache Tomcat&reg; - Contact Information</title>
 </head>
 <body>
 <div id="wrapper">
@@ -18,7 +18,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/download-60.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-60.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-60.html (original)
+++ tomcat/site/trunk/docs/download-60.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Apache Tomcat 6 Downloads</title>
+<title>Apache Tomcat&reg; - Apache Tomcat 6 Software Downloads</title>
 </head>
 <body>
 <div id="wrapper">
@@ -18,7 +18,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">
@@ -209,7 +210,7 @@
 <div id="mainRight">
 <div id="content">
 <h2 style="display: none;">Content</h2>
-<h3 id="Tomcat_6_Downloads">Tomcat 6 Downloads</h3>
+<h3 id="Tomcat_6_Software_Downloads">Tomcat 6 Software Downloads</h3>
 <div class="text">
     
 <p>Welcome to the Apache Tomcat<sup>&reg;</sup> 6.x software download page. This page

Modified: tomcat/site/trunk/docs/download-70.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-70.html (original)
+++ tomcat/site/trunk/docs/download-70.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Apache Tomcat 7 Downloads</title>
+<title>Apache Tomcat&reg; - Apache Tomcat 7 Software Downloads</title>
 </head>
 <body>
 <div id="wrapper">
@@ -18,7 +18,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">
@@ -209,7 +210,7 @@
 <div id="mainRight">
 <div id="content">
 <h2 style="display: none;">Content</h2>
-<h3 id="Tomcat_7_Downloads">Tomcat 7 Downloads</h3>
+<h3 id="Tomcat_7_Software_Downloads">Tomcat 7 Software Downloads</h3>
 <div class="text">
     
 <p>Welcome to the Apache Tomcat<sup>&reg;</sup> 7.x software download page. This page

Modified: tomcat/site/trunk/docs/download-80.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-80.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-80.html (original)
+++ tomcat/site/trunk/docs/download-80.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Apache Tomcat 8 Downloads</title>
+<title>Apache Tomcat&reg; - Apache Tomcat 8 Software Downloads</title>
 </head>
 <body>
 <div id="wrapper">
@@ -18,7 +18,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">
@@ -209,7 +210,7 @@
 <div id="mainRight">
 <div id="content">
 <h2 style="display: none;">Content</h2>
-<h3 id="Tomcat_8_Downloads">Tomcat 8 Downloads</h3>
+<h3 id="Tomcat_8_Software_Downloads">Tomcat 8 Software Downloads</h3>
 <div class="text">
     
 <p>Welcome to the Apache Tomcat<sup>&reg;</sup> 8.x software download page. This page

Modified: tomcat/site/trunk/docs/download-90.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-90.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-90.html (original)
+++ tomcat/site/trunk/docs/download-90.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Apache Tomcat 9 Downloads</title>
+<title>Apache Tomcat&reg; - Apache Tomcat 9 Software Downloads</title>
 </head>
 <body>
 <div id="wrapper">
@@ -18,7 +18,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">
@@ -209,7 +210,7 @@
 <div id="mainRight">
 <div id="content">
 <h2 style="display: none;">Content</h2>
-<h3 id="Tomcat_9_Downloads">Tomcat 9 Downloads</h3>
+<h3 id="Tomcat_9_Software_Downloads">Tomcat 9 Software Downloads</h3>
 <div class="text">
     
 <p>Welcome to the Apache Tomcat<sup>&reg;</sup> 9.x software download page. This page

Modified: tomcat/site/trunk/docs/download-connectors.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-connectors.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-connectors.html (original)
+++ tomcat/site/trunk/docs/download-connectors.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Tomcat Connectors (mod_jk) Downloads</title>
+<title>Apache Tomcat&reg; - Tomcat Connectors (mod_jk) Downloads</title>
 </head>
 <body>
 <div id="wrapper">
@@ -18,7 +18,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/download-native.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-native.html (original)
+++ tomcat/site/trunk/docs/download-native.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Tomcat Native Downloads</title>
+<title>Apache Tomcat&reg; - Tomcat Native Downloads</title>
 </head>
 <body>
 <div id="wrapper">
@@ -18,7 +18,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/download-taglibs.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-taglibs.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-taglibs.html (original)
+++ tomcat/site/trunk/docs/download-taglibs.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Apache Taglibs Downloads</title>
+<title>Apache Tomcat&reg; - Apache Taglibs Downloads</title>
 </head>
 <body>
 <div id="wrapper">
@@ -18,7 +18,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/findhelp.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/findhelp.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/findhelp.html (original)
+++ tomcat/site/trunk/docs/findhelp.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Find Help</title>
+<title>Apache Tomcat&reg; - Find Help</title>
 </head>
 <body>
 <div id="wrapper">
@@ -18,7 +18,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/getinvolved.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/getinvolved.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/getinvolved.html (original)
+++ tomcat/site/trunk/docs/getinvolved.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Get Involved</title>
+<title>Apache Tomcat&reg; - Get Involved</title>
 </head>
 <body>
 <div id="wrapper">
@@ -18,7 +18,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/heritage.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/heritage.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/heritage.html (original)
+++ tomcat/site/trunk/docs/heritage.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Heritage</title>
+<title>Apache Tomcat&reg; - Heritage</title>
 </head>
 <body>
 <div id="wrapper">
@@ -18,7 +18,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/index.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Welcome!</title>
+<title>Apache Tomcat&reg; - Welcome!</title>
 <meta name="author" content="Apache Tomcat Project">
 <meta name="google-site-verification" content="nA9F0GvGNjVCU9W7HBziONQVx6FehvgQglI1X7WPfRw">
 </head>
@@ -20,7 +20,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">
@@ -215,10 +216,10 @@
 <div class="text">
 
 
-<p>The Apache Tomcat<sup>&reg;</sup> software is an open source implementation of the Java
-Servlet, JavaServer Pages, Java Expression Language and Java WebSocket
-technologies. The Java Servlet, JavaServer Pages, Java Expression Language and
-Java WebSocket specifications are developed under the
+<p>The Apache Tomcat<sup>&reg;</sup> software is an open source implementation
+of the Java Servlet, JavaServer Pages, Java Expression Language and Java
+WebSocket technologies. The Java Servlet, JavaServer Pages, Java Expression
+Language and Java WebSocket specifications are developed under the
 <a href="http://jcp.org/en/introduction/overview" rel="nofollow">Java Community
 Process</a>.
 </p>

Modified: tomcat/site/trunk/docs/irc.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/irc.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/irc.html (original)
+++ tomcat/site/trunk/docs/irc.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Apache Tomcat on IRC</title>
+<title>Apache Tomcat&reg; - Apache Tomcat on IRC</title>
 <meta name="author" content="Marc A. Saegesser">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/legal.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/legal.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/legal.html (original)
+++ tomcat/site/trunk/docs/legal.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Legal Stuff They Make Us Say</title>
+<title>Apache Tomcat&reg; - Legal Stuff They Make Us Say</title>
 <meta name="author" content="Apache Tomcat Project">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/lists.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/lists.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/lists.html (original)
+++ tomcat/site/trunk/docs/lists.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Mailing Lists</title>
+<title>Apache Tomcat&reg; - Mailing Lists</title>
 <meta name="author" content="Apache Tomcat Team">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/maven-plugin.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/maven-plugin.html (original)
+++ tomcat/site/trunk/docs/maven-plugin.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Tomcat Maven Plugin</title>
+<title>Apache Tomcat&reg; - Tomcat Maven Plugin</title>
 <meta name="author" content="Apache Tomcat Team">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/migration-6.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-6.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-6.html (original)
+++ tomcat/site/trunk/docs/migration-6.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Migration Guide - Tomcat 6.0.x</title>
+<title>Apache Tomcat&reg; - Migration Guide - Tomcat 6.0.x</title>
 <meta name="author" content="Apache Tomcat Project">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/migration-7.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-7.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-7.html (original)
+++ tomcat/site/trunk/docs/migration-7.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Migration Guide - Tomcat 7.0.x</title>
+<title>Apache Tomcat&reg; - Migration Guide - Tomcat 7.0.x</title>
 <meta name="author" content="Apache Tomcat Project">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/migration-8.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-8.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-8.html (original)
+++ tomcat/site/trunk/docs/migration-8.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Migration Guide - Tomcat 8.0.x</title>
+<title>Apache Tomcat&reg; - Migration Guide - Tomcat 8.0.x</title>
 <meta name="author" content="Apache Tomcat Project">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/migration-85.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-85.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-85.html (original)
+++ tomcat/site/trunk/docs/migration-85.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Migration Guide - Tomcat 8.5.x</title>
+<title>Apache Tomcat&reg; - Migration Guide - Tomcat 8.5.x</title>
 <meta name="author" content="Apache Tomcat Project">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/migration-9.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-9.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-9.html (original)
+++ tomcat/site/trunk/docs/migration-9.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Migration Guide - Tomcat 9.0.x</title>
+<title>Apache Tomcat&reg; - Migration Guide - Tomcat 9.0.x</title>
 <meta name="author" content="Apache Tomcat Project">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/migration.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration.html (original)
+++ tomcat/site/trunk/docs/migration.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Migration Guide</title>
+<title>Apache Tomcat&reg; - Migration Guide</title>
 <meta name="author" content="Apache Tomcat Project">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/oldnews-2010.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2010.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2010.html (original)
+++ tomcat/site/trunk/docs/oldnews-2010.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Old news! - 2010</title>
+<title>Apache Tomcat&reg; - Old news! - 2010</title>
 <meta name="author" content="Apache Tomcat Project">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/oldnews-2011.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2011.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2011.html (original)
+++ tomcat/site/trunk/docs/oldnews-2011.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Old news! - 2011</title>
+<title>Apache Tomcat&reg; - Old news! - 2011</title>
 <meta name="author" content="Apache Tomcat Project">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/oldnews-2012.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2012.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2012.html (original)
+++ tomcat/site/trunk/docs/oldnews-2012.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Old news! - 2012</title>
+<title>Apache Tomcat&reg; - Old news! - 2012</title>
 <meta name="author" content="Apache Tomcat Project">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/oldnews-2013.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2013.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2013.html (original)
+++ tomcat/site/trunk/docs/oldnews-2013.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Old news!</title>
+<title>Apache Tomcat&reg; - Old news!</title>
 <meta name="author" content="Apache Tomcat Project">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/oldnews-2014.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2014.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2014.html (original)
+++ tomcat/site/trunk/docs/oldnews-2014.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Old news!</title>
+<title>Apache Tomcat&reg; - Old news!</title>
 <meta name="author" content="Apache Tomcat Project">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/oldnews-2015.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2015.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2015.html (original)
+++ tomcat/site/trunk/docs/oldnews-2015.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Old news!</title>
+<title>Apache Tomcat&reg; - Old news!</title>
 <meta name="author" content="Apache Tomcat Project">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/oldnews.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews.html (original)
+++ tomcat/site/trunk/docs/oldnews.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Old news!</title>
+<title>Apache Tomcat&reg; - Old news!</title>
 <meta name="author" content="Apache Tomcat Project">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/presentations.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/presentations.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/presentations.html (original)
+++ tomcat/site/trunk/docs/presentations.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Presentations</title>
+<title>Apache Tomcat&reg; - Presentations</title>
 </head>
 <body>
 <div id="wrapper">
@@ -18,7 +18,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/resources.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/resources.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/resources.html (original)
+++ tomcat/site/trunk/docs/resources.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Resources</title>
+<title>Apache Tomcat&reg; - Resources</title>
 <meta name="author" content="Remy Maucherat">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/security-3.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-3.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-3.html (original)
+++ tomcat/site/trunk/docs/security-3.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Apache Tomcat 3.x vulnerabilities</title>
+<title>Apache Tomcat&reg; - Apache Tomcat 3.x vulnerabilities</title>
 <meta name="author" content="Apache Tomcat Project">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/security-4.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-4.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-4.html (original)
+++ tomcat/site/trunk/docs/security-4.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Apache Tomcat 4.x vulnerabilities</title>
+<title>Apache Tomcat&reg; - Apache Tomcat 4.x vulnerabilities</title>
 <meta name="author" content="Apache Tomcat Project">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/security-5.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-5.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-5.html (original)
+++ tomcat/site/trunk/docs/security-5.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Apache Tomcat 5 vulnerabilities</title>
+<title>Apache Tomcat&reg; - Apache Tomcat 5 vulnerabilities</title>
 <meta name="author" content="Apache Tomcat Project">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/security-6.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-6.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-6.html (original)
+++ tomcat/site/trunk/docs/security-6.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Apache Tomcat 6 vulnerabilities</title>
+<title>Apache Tomcat&reg; - Apache Tomcat 6 vulnerabilities</title>
 <meta name="author" content="Apache Tomcat Project">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/security-7.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-7.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-7.html (original)
+++ tomcat/site/trunk/docs/security-7.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Apache Tomcat 7 vulnerabilities</title>
+<title>Apache Tomcat&reg; - Apache Tomcat 7 vulnerabilities</title>
 <meta name="author" content="Apache Tomcat Project">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/security-8.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-8.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-8.html (original)
+++ tomcat/site/trunk/docs/security-8.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Apache Tomcat 8 vulnerabilities</title>
+<title>Apache Tomcat&reg; - Apache Tomcat 8 vulnerabilities</title>
 <meta name="author" content="Apache Tomcat Project">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/security-9.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-9.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-9.html (original)
+++ tomcat/site/trunk/docs/security-9.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Apache Tomcat 8 vulnerabilities</title>
+<title>Apache Tomcat&reg; - Apache Tomcat 8 vulnerabilities</title>
 <meta name="author" content="Apache Tomcat Project">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/security-impact.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-impact.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-impact.html (original)
+++ tomcat/site/trunk/docs/security-impact.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Security Impact Levels</title>
+<title>Apache Tomcat&reg; - Security Impact Levels</title>
 <meta name="author" content="Apache Tomcat Project">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/security-jk.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-jk.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-jk.html (original)
+++ tomcat/site/trunk/docs/security-jk.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Apache Tomcat JK Connectors vulnerabilities</title>
+<title>Apache Tomcat&reg; - Apache Tomcat JK Connectors vulnerabilities</title>
 <meta name="author" content="Apache Tomcat Project">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/security-native.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-native.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-native.html (original)
+++ tomcat/site/trunk/docs/security-native.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Apache Tomcat APR/native Connector vulnerabilities</title>
+<title>Apache Tomcat&reg; - Apache Tomcat APR/native Connector vulnerabilities</title>
 <meta name="author" content="Apache Tomcat Project">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/security-taglibs.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-taglibs.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-taglibs.html (original)
+++ tomcat/site/trunk/docs/security-taglibs.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Apache Taglibs vulnerabilities</title>
+<title>Apache Tomcat&reg; - Apache Taglibs vulnerabilities</title>
 <meta name="author" content="Apache Tomcat Project">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/security.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security.html (original)
+++ tomcat/site/trunk/docs/security.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Reporting Security Problems</title>
+<title>Apache Tomcat&reg; - Reporting Security Problems</title>
 <meta name="author" content="Apache Tomcat Project">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/svn.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/svn.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/svn.html (original)
+++ tomcat/site/trunk/docs/svn.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Subversion Repository Access</title>
+<title>Apache Tomcat&reg; - Subversion Repository Access</title>
 </head>
 <body>
 <div id="wrapper">
@@ -18,7 +18,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/taglibs.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/taglibs.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/taglibs.html (original)
+++ tomcat/site/trunk/docs/taglibs.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Apache Taglibs</title>
+<title>Apache Tomcat&reg; - Apache Taglibs</title>
 <meta name="author" content="Apache Tomcat Project">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/tomcat-55-eol.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-55-eol.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tomcat-55-eol.html (original)
+++ tomcat/site/trunk/docs/tomcat-55-eol.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - End of life for Apache Tomcat 5.5.x</title>
+<title>Apache Tomcat&reg; - End of life for Apache Tomcat 5.5.x</title>
 <meta name="author" content="Apache Tomcat Project">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/tomcat-60-eol.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-60-eol.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tomcat-60-eol.html (original)
+++ tomcat/site/trunk/docs/tomcat-60-eol.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - End of life for Apache Tomcat 6.0.x</title>
+<title>Apache Tomcat&reg; - End of life for Apache Tomcat 6.0.x</title>
 <meta name="author" content="Apache Tomcat Project">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/tools.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tools.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tools.html (original)
+++ tomcat/site/trunk/docs/tools.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Developer Tools</title>
+<title>Apache Tomcat&reg; - Developer Tools</title>
 <meta name="author" content="Apache Tomcat Project">
 </head>
 <body>
@@ -19,7 +19,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/whichversion.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/whichversion.html (original)
+++ tomcat/site/trunk/docs/whichversion.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Which Version Do I Want?</title>
+<title>Apache Tomcat&reg; - Which Version Do I Want?</title>
 <meta name="author" content="Marc A. Saegesser">
 <meta name="author" content="Yoav Shapira">
 <meta name="author" content="Jean-Frederic Clere">
@@ -21,7 +21,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/docs/whoweare.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whoweare.html?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/docs/whoweare.html (original)
+++ tomcat/site/trunk/docs/whoweare.html Thu Apr 14 08:38:51 2016
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat - Who We Are</title>
+<title>Apache Tomcat&reg; - Who We Are</title>
 </head>
 <body>
 <div id="wrapper">
@@ -18,7 +18,8 @@
 <div class="asfLogo noPrint">
 <a href="http://www.apache.org/" target="_blank"><img src="./images/asf_logo.svg" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"></a>
 </div>
-<h1 style="margin-top: 35px;">Apache Tomcat</h1>
+<h1 style="margin-top: 35px;">Apache Tomcat<sup>&reg;</sup>
+</h1>
 <div style="clear: right;"></div>
 <div class="searchbox noPrint">
 <form action="https://www.google.com/search" method="get">

Modified: tomcat/site/trunk/xdocs/download-60.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-60.xml?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/download-60.xml (original)
+++ tomcat/site/trunk/xdocs/download-60.xml Thu Apr 14 08:38:51 2016
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document>
   <properties>
-    <title>Apache Tomcat 6 Downloads</title>
+    <title>Apache Tomcat 6 Software Downloads</title>
   </properties>
   <body>
     
-  <section name="Tomcat 6 Downloads">
+  <section name="Tomcat 6 Software Downloads">
     <p>Welcome to the Apache Tomcat<sup>&#174;</sup> 6.x software download page. This page
     provides download links for obtaining the latest version of Tomcat 6.0.x
     software, as well as links to the archives of older releases.</p>

Modified: tomcat/site/trunk/xdocs/download-70.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-70.xml?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/download-70.xml (original)
+++ tomcat/site/trunk/xdocs/download-70.xml Thu Apr 14 08:38:51 2016
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document>
   <properties>
-    <title>Apache Tomcat 7 Downloads</title>
+    <title>Apache Tomcat 7 Software Downloads</title>
   </properties>
   <body>
     
-  <section name="Tomcat 7 Downloads">
+  <section name="Tomcat 7 Software Downloads">
     <p>Welcome to the Apache Tomcat<sup>&#174;</sup> 7.x software download page. This page
     provides download links for obtaining the latest version of Tomcat 7.0.x
     software, as well as links to the archives of older releases.

Modified: tomcat/site/trunk/xdocs/download-80.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-80.xml?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/download-80.xml (original)
+++ tomcat/site/trunk/xdocs/download-80.xml Thu Apr 14 08:38:51 2016
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document>
   <properties>
-    <title>Apache Tomcat 8 Downloads</title>
+    <title>Apache Tomcat 8 Software Downloads</title>
   </properties>
   <body>
     
-  <section name="Tomcat 8 Downloads">
+  <section name="Tomcat 8 Software Downloads">
     <p>Welcome to the Apache Tomcat<sup>&#174;</sup> 8.x software download page. This page
     provides download links for obtaining the latest versions of Tomcat 8.x
     software, as well as links to the archives of older releases.

Modified: tomcat/site/trunk/xdocs/download-90.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-90.xml?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/download-90.xml (original)
+++ tomcat/site/trunk/xdocs/download-90.xml Thu Apr 14 08:38:51 2016
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document>
   <properties>
-    <title>Apache Tomcat 9 Downloads</title>
+    <title>Apache Tomcat 9 Software Downloads</title>
   </properties>
   <body>
     
-  <section name="Tomcat 9 Downloads">
+  <section name="Tomcat 9 Software Downloads">
     <p>Welcome to the Apache Tomcat<sup>&#174;</sup> 9.x software download page. This page
     provides download links for obtaining the latest version of Tomcat 9.0.x
     software, as well as links to the archives of older releases.

Modified: tomcat/site/trunk/xdocs/index.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/index.xml (original)
+++ tomcat/site/trunk/xdocs/index.xml Thu Apr 14 08:38:51 2016
@@ -13,10 +13,10 @@
 
 <section name="Apache Tomcat">
 
-<p>The Apache Tomcat<sup>&#174;</sup> software is an open source implementation of the Java
-Servlet, JavaServer Pages, Java Expression Language and Java WebSocket
-technologies. The Java Servlet, JavaServer Pages, Java Expression Language and
-Java WebSocket specifications are developed under the
+<p>The Apache Tomcat<sup>&#174;</sup> software is an open source implementation
+of the Java Servlet, JavaServer Pages, Java Expression Language and Java
+WebSocket technologies. The Java Servlet, JavaServer Pages, Java Expression
+Language and Java WebSocket specifications are developed under the
 <a href="http://jcp.org/en/introduction/overview" rel="nofollow">Java Community
 Process</a>.
 </p>

Modified: tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl?rev=1739035&r1=1739034&r2=1739035&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl (original)
+++ tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Thu Apr 14 08:38:51 2016
@@ -60,7 +60,7 @@
   -->
   <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css"/>
     <xsl:apply-templates select="meta"/>
-    <title><xsl:value-of select="$project/title"/> - <xsl:value-of select="properties/title"/></title>
+    <title><xsl:value-of select="$project/title"/>&#174; - <xsl:value-of select="properties/title"/></title>
     <xsl:for-each select="properties/author">
       <xsl:variable name="name">
         <xsl:value-of select="."/>
@@ -98,7 +98,7 @@
         </xsl:variable>
         <div style="height: 1px;"/>
         <div class="asfLogo noPrint"><a href="http://www.apache.org/" target="_blank"><img src="{$src-asf-logo}" alt="The Apache Software Foundation" style="width: 205px; height: 83px; margin-right: 15px;"/></a></div>
-        <h1 style="margin-top: 35px;"><xsl:value-of select="$project/title"/></h1>
+        <h1 style="margin-top: 35px;"><xsl:value-of select="$project/title"/><sup>&#174;</sup></h1>
         <div style="clear: right;"/>
 
     <!-- Search box: uses CSS positioning -->



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