Author: markt
Date: Thu Apr 14 08:15:34 2016
New Revision: 1739033

URL: http://svn.apache.org/viewvc?rev=1739033&view=rev
Log:
TM -> (r). Make sure Tomcat is used as an adjective on index and download pages.

Modified:
    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/index.html
    tomcat/site/trunk/docs/whichversion.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/download-connectors.xml
    tomcat/site/trunk/xdocs/download-native.xml
    tomcat/site/trunk/xdocs/index.xml
    tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/docs/download-60.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-60.html?rev=1739033&r1=1739032&r2=1739033&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-60.html (original)
+++ tomcat/site/trunk/docs/download-60.html Thu Apr 14 08:15:34 2016
@@ -212,9 +212,9 @@
 <h3 id="Tomcat_6_Downloads">Tomcat 6 Downloads</h3>
 <div class="text">
     
-<p>Welcome to the Apache Tomcat&trade; 6.x download page. This page provides
-    download links for obtaining the latest version of Tomcat 6.0.x, as well as
-    links to the archives of older releases.</p>
+<p>Welcome to the Apache Tomcat&reg; 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>
     
 <p>Users of Tomcat 6 should be aware that the Tomcat team have announced the
     <a href="tomcat-60-eol.html">end of life date for Tomcat 6.x</a>. Users of

Modified: tomcat/site/trunk/docs/download-70.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=1739033&r1=1739032&r2=1739033&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-70.html (original)
+++ tomcat/site/trunk/docs/download-70.html Thu Apr 14 08:15:34 2016
@@ -212,9 +212,9 @@
 <h3 id="Tomcat_7_Downloads">Tomcat 7 Downloads</h3>
 <div class="text">
     
-<p>Welcome to the Apache Tomcat&trade; 7.x download page. This page provides 
download
-    links for obtaining the latest version of Tomcat 7.0.x, as well as links
-    to the archives of older releases.
+<p>Welcome to the Apache Tomcat&reg; 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.
     </p>
   
 </div>

Modified: tomcat/site/trunk/docs/download-80.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-80.html?rev=1739033&r1=1739032&r2=1739033&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-80.html (original)
+++ tomcat/site/trunk/docs/download-80.html Thu Apr 14 08:15:34 2016
@@ -212,9 +212,9 @@
 <h3 id="Tomcat_8_Downloads">Tomcat 8 Downloads</h3>
 <div class="text">
     
-<p>Welcome to the Apache Tomcat&trade; 8.x download page. This page provides 
download
-    links for obtaining the latest version of Tomcat 8.0.x, as well as links
-    to the archives of older releases.
+<p>Welcome to the Apache Tomcat&reg; 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.
     </p>
   
 </div>

Modified: tomcat/site/trunk/docs/download-90.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-90.html?rev=1739033&r1=1739032&r2=1739033&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-90.html (original)
+++ tomcat/site/trunk/docs/download-90.html Thu Apr 14 08:15:34 2016
@@ -212,9 +212,9 @@
 <h3 id="Tomcat_9_Downloads">Tomcat 9 Downloads</h3>
 <div class="text">
     
-<p>Welcome to the Apache Tomcat&trade; 9.x download page. This page provides
-    download links for obtaining the latest version of Tomcat 9.0.x, as well as
-    links to the archives of older releases.
+<p>Welcome to the Apache Tomcat&reg; 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.
     </p>
   
 </div>

Modified: tomcat/site/trunk/docs/download-connectors.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-connectors.html?rev=1739033&r1=1739032&r2=1739033&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-connectors.html (original)
+++ tomcat/site/trunk/docs/download-connectors.html Thu Apr 14 08:15:34 2016
@@ -213,10 +213,11 @@
 <div class="text">
 
       
-<p>Use the links below to download Apache Tomcat&trade; Connectors from one of
-      our mirrors.  You <strong>must</strong> <a 
href="#Verify_the_Integrity_of_the_Files">verify the
-      integrity</a> of the downloaded files using signatures downloaded from
-      our main distribution directory.</p>
+<p>Use the links below to download the Apache Tomcat&reg; Connectors
+      software from one of our mirrors.  You <strong>must</strong>
+      <a href="#Verify_the_Integrity_of_the_Files">verify the integrity</a> of
+      the downloaded files using signatures downloaded from our main
+      distribution directory.</p>
 
       
 <p>Only current recommended releases are available on the main

Modified: tomcat/site/trunk/docs/download-native.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1739033&r1=1739032&r2=1739033&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-native.html (original)
+++ tomcat/site/trunk/docs/download-native.html Thu Apr 14 08:15:34 2016
@@ -213,10 +213,11 @@
 <div class="text">
 
       
-<p>Use the links below to download Apache Tomcat&trade; Native from one of
-      our mirrors.  You <strong>must</strong> <a 
href="#Verify_the_Integrity_of_the_Files">verify the
-      integrity</a> of the downloaded files using signatures downloaded from
-      our main distribution directory.</p>
+<p>Use the links below to download the Apache Tomcat&reg; Native software
+      from one of our mirrors. You <strong>must</strong>
+      <a href="#Verify_the_Integrity_of_the_Files">verify the integrity</a> of
+      the downloaded files using signatures downloaded from our main
+      distribution directory.</p>
 
       
 <p>Only current recommended releases are available on the main

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1739033&r1=1739032&r2=1739033&view=diff
==============================================================================
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Thu Apr 14 08:15:34 2016
@@ -215,7 +215,7 @@
 <div class="text">
 
 
-<p>Apache Tomcat&trade; is an open source software implementation of the Java
+<p>The Apache Tomcat&reg; 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
@@ -224,17 +224,18 @@ Process</a>.
 </p>
 
 
-<p>Apache Tomcat is developed in an open and participatory environment and
-released under the <a href="http://www.apache.org/licenses";>Apache License
-version 2</a>.  Apache Tomcat is intended to be a collaboration of the
-best-of-breed developers from around the world.  We invite you to
-participate in this open development project.  To learn more about getting
-involved, <a href="getinvolved.html">click here</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
+Apache Tomcat project is intended to be a collaboration of the best-of-breed
+developers from around the world.  We invite you to participate in this open
+development project.  To learn more about getting involved,
+<a href="getinvolved.html">click here</a>.</p>
 
 
-<p>Apache Tomcat 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
+<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="http://wiki.apache.org/tomcat/PoweredBy";>PoweredBy</a> wiki page.</p>
 
 

Modified: tomcat/site/trunk/docs/whichversion.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1739033&r1=1739032&r2=1739033&view=diff
==============================================================================
--- tomcat/site/trunk/docs/whichversion.html (original)
+++ tomcat/site/trunk/docs/whichversion.html Thu Apr 14 08:15:34 2016
@@ -215,7 +215,7 @@
 <h3 id="Apache_Tomcat_Versions">Apache Tomcat Versions</h3>
 <div class="text">
 
-<p>Apache Tomcat&trade; is an open source software implementation of the Java 
Servlet
+<p>Apache Tomcat&reg; is an open source software implementation of the Java 
Servlet
 and JavaServer Pages technologies. Different versions of Apache Tomcat are
 available for different versions of the Servlet and JSP specifications. The
 mapping between the specifications and the respective Apache Tomcat versions 
is:

Modified: tomcat/site/trunk/xdocs/download-60.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-60.xml?rev=1739033&r1=1739032&r2=1739033&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/download-60.xml (original)
+++ tomcat/site/trunk/xdocs/download-60.xml Thu Apr 14 08:15:34 2016
@@ -6,9 +6,9 @@
   <body>
     
   <section name="Tomcat 6 Downloads">
-    <p>Welcome to the Apache Tomcat&#8482; 6.x download page. This page 
provides
-    download links for obtaining the latest version of Tomcat 6.0.x, as well as
-    links to the archives of older releases.</p>
+    <p>Welcome to the Apache Tomcat&#174; 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>
     <p>Users of Tomcat 6 should be aware that the Tomcat team have announced 
the
     <a href="tomcat-60-eol.html">end of life date for Tomcat 6.x</a>. Users of
     Tomcat 6.x should plan to upgrade before Tomcat 6.x reaches end of 
life.</p>

Modified: tomcat/site/trunk/xdocs/download-70.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-70.xml?rev=1739033&r1=1739032&r2=1739033&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/download-70.xml (original)
+++ tomcat/site/trunk/xdocs/download-70.xml Thu Apr 14 08:15:34 2016
@@ -6,9 +6,9 @@
   <body>
     
   <section name="Tomcat 7 Downloads">
-    <p>Welcome to the Apache Tomcat&#8482; 7.x download page. This page 
provides download
-    links for obtaining the latest version of Tomcat 7.0.x, as well as links
-    to the archives of older releases.
+    <p>Welcome to the Apache Tomcat&#174; 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.
     </p>
   </section>
 

Modified: tomcat/site/trunk/xdocs/download-80.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-80.xml?rev=1739033&r1=1739032&r2=1739033&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/download-80.xml (original)
+++ tomcat/site/trunk/xdocs/download-80.xml Thu Apr 14 08:15:34 2016
@@ -6,9 +6,9 @@
   <body>
     
   <section name="Tomcat 8 Downloads">
-    <p>Welcome to the Apache Tomcat&#8482; 8.x download page. This page 
provides download
-    links for obtaining the latest version of Tomcat 8.0.x, as well as links
-    to the archives of older releases.
+    <p>Welcome to the Apache Tomcat&#174; 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.
     </p>
   </section>
 

Modified: tomcat/site/trunk/xdocs/download-90.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-90.xml?rev=1739033&r1=1739032&r2=1739033&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/download-90.xml (original)
+++ tomcat/site/trunk/xdocs/download-90.xml Thu Apr 14 08:15:34 2016
@@ -6,9 +6,9 @@
   <body>
     
   <section name="Tomcat 9 Downloads">
-    <p>Welcome to the Apache Tomcat&#8482; 9.x download page. This page 
provides
-    download links for obtaining the latest version of Tomcat 9.0.x, as well as
-    links to the archives of older releases.
+    <p>Welcome to the Apache Tomcat&#174; 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.
     </p>
   </section>
 

Modified: tomcat/site/trunk/xdocs/download-connectors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-connectors.xml?rev=1739033&r1=1739032&r2=1739033&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/download-connectors.xml (original)
+++ tomcat/site/trunk/xdocs/download-connectors.xml Thu Apr 14 08:15:34 2016
@@ -4,10 +4,11 @@
   <body>
     <section name="Tomcat Connectors (mod_jk) Downloads">
 
-      <p>Use the links below to download Apache Tomcat&#8482; Connectors from 
one of
-      our mirrors.  You <strong>must</strong> <a 
href="#Verify_the_Integrity_of_the_Files">verify the
-      integrity</a> of the downloaded files using signatures downloaded from
-      our main distribution directory.</p>
+      <p>Use the links below to download the Apache Tomcat&#174; Connectors
+      software from one of our mirrors.  You <strong>must</strong>
+      <a href="#Verify_the_Integrity_of_the_Files">verify the integrity</a> of
+      the downloaded files using signatures downloaded from our main
+      distribution directory.</p>
 
       <p>Only current recommended releases are available on the main
       distribution site and its mirrors.  Older releases and the historical 
mod_jk2

Modified: tomcat/site/trunk/xdocs/download-native.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-native.xml?rev=1739033&r1=1739032&r2=1739033&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/download-native.xml (original)
+++ tomcat/site/trunk/xdocs/download-native.xml Thu Apr 14 08:15:34 2016
@@ -4,10 +4,11 @@
   <body>
     <section name="Tomcat Native Downloads">
 
-      <p>Use the links below to download Apache Tomcat&#8482; Native from one 
of
-      our mirrors.  You <strong>must</strong> <a 
href="#Verify_the_Integrity_of_the_Files">verify the
-      integrity</a> of the downloaded files using signatures downloaded from
-      our main distribution directory.</p>
+      <p>Use the links below to download the Apache Tomcat&#174; Native 
software
+      from one of our mirrors. You <strong>must</strong>
+      <a href="#Verify_the_Integrity_of_the_Files">verify the integrity</a> of
+      the downloaded files using signatures downloaded from our main
+      distribution directory.</p>
 
       <p>Only current recommended releases are available on the main
       distribution site and its mirrors.  Older releases are available from the

Modified: tomcat/site/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1739033&r1=1739032&r2=1739033&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/index.xml (original)
+++ tomcat/site/trunk/xdocs/index.xml Thu Apr 14 08:15:34 2016
@@ -13,7 +13,7 @@
 
 <section name="Apache Tomcat">
 
-<p>Apache Tomcat&#8482; is an open source software implementation of the Java
+<p>The Apache Tomcat&#174; 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
@@ -21,16 +21,17 @@ Java WebSocket specifications are develo
 Process</a>.
 </p>
 
-<p>Apache Tomcat is developed in an open and participatory environment and
-released under the <a href="http://www.apache.org/licenses";>Apache License
-version 2</a>.  Apache Tomcat is intended to be a collaboration of the
-best-of-breed developers from around the world.  We invite you to
-participate in this open development project.  To learn more about getting
-involved, <a href="getinvolved.html">click here</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
+Apache Tomcat project is intended to be a collaboration of the best-of-breed
+developers from around the world.  We invite you to participate in this open
+development project.  To learn more about getting involved,
+<a href="getinvolved.html">click here</a>.</p>
 
-<p>Apache Tomcat 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
+<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="http://wiki.apache.org/tomcat/PoweredBy";>PoweredBy</a> wiki page.</p>
 
 <p>Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat

Modified: tomcat/site/trunk/xdocs/whichversion.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whichversion.xml?rev=1739033&r1=1739032&r2=1739033&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/whichversion.xml (original)
+++ tomcat/site/trunk/xdocs/whichversion.xml Thu Apr 14 08:15:34 2016
@@ -11,7 +11,7 @@
 <body>
 
 <section name="Apache Tomcat Versions">
-<p>Apache Tomcat&#8482; is an open source software implementation of the Java 
Servlet
+<p>Apache Tomcat&#174; is an open source software implementation of the Java 
Servlet
 and JavaServer Pages technologies. Different versions of Apache Tomcat are
 available for different versions of the Servlet and JSP specifications. The
 mapping between the specifications and the respective Apache Tomcat versions 
is:



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

Reply via email to