You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2005/05/16 13:19:38 UTC

cvs commit: jakarta-tomcat-site/xdocs/stylesheets project.xml

remm        2005/05/16 04:19:38

  Modified:    docs     bugreport.html index.html irc.html resources.html
               docs/faq development.html
               docs/faq/printer development.html
               xdocs    bugreport.xml index.xml irc.xml resources.xml
               xdocs/stylesheets project.xml
  Log:
  - Fix branding to use Apache Tomcat everywhere.
  
  Revision  Changes    Path
  1.32      +32 -32    jakarta-tomcat-site/docs/bugreport.html
  
  Index: bugreport.html
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-site/docs/bugreport.html,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- bugreport.html	3 May 2005 13:48:12 -0000	1.31
  +++ bugreport.html	16 May 2005 11:19:38 -0000	1.32
  @@ -2,7 +2,7 @@
   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
   <html>
   <head>
  -<title>The Jakarta Site - Report a Tomcat Bug</title>
  +<title>The Jakarta Site - Reporting Apache Tomcat Bugs</title>
   <meta value="Glenn L. Nielsen" name="author" />
   <meta value="" name="email" />
   </head>
  @@ -168,9 +168,9 @@
   <td>
   <p>
   <blockquote>
  -<p>The Tomcat community consists of those who use Tomcat, help answer
  +<p>The Apache Tomcat community consists of those who use Apache Tomcat, help answer
   questions on discussions lists, contribute documentation and patches,
  -and those who develop and maintain the code for Tomcat.  Almost all those
  +and those who develop and maintain the code for Apache Tomcat.  Almost all those
   who assist on a day to day basis resolving bug reports do this for a
   wide variety of reasons, and almost all of them do this on their own time.</p>
   
  @@ -179,7 +179,7 @@
   privately by email to <a href="mailto:security@apache.org">security@apache.org</a>.
   </p>
   
  -<p>Many bugs reported end up not being a bug in the Tomcat code, but are
  +<p>Many bugs reported end up not being a bug in the Apache Tomcat code, but are
   due to misconfiguration, problems caused by installed applications, the
   operating system, etc.
   <ul>
  @@ -203,8 +203,8 @@
   <tr>
   <td bgcolor="#525D76">
   <font face="arial,helvetica,sanserif" color="#ffffff">
  -<a name="Resources to help resolve Tomcat problems">
  -<strong>Resources to help resolve Tomcat problems</strong>
  +<a name="Resources to help resolve Apache Tomcat problems">
  +<strong>Resources to help resolve Apache Tomcat problems</strong>
   </a>
   </font>
   </td>
  @@ -232,12 +232,12 @@
       <p>
       <li>
   <b>Documentation</b> - Review the documentation for the version
  -      of Tomcat you are using.  The problem you are having may already
  +      of Apache Tomcat you are using.  The problem you are having may already
         be addressed in the docs.</li>
       <li>
  -<b>Logs</b> - The logs which Tomcat generates can be a valuable
  +<b>Logs</b> - The logs which Apache Tomcat generates can be a valuable
         resource when trying to diagnose a problem.  Please review them.
  -      You may want to enable debug output in your Tomcat configuration
  +      You may want to enable debug output in your Apache Tomcat configuration
         so that you have more information to help diagnose the problem.</li>
       <li>
   <b>FAQ's</b> - Search Frequently Asked Question documents. FAQ's
  @@ -275,13 +275,13 @@
           <li>Someone else may have reported the bug, you could add supporting
           information to help reproduce and resolve the bug.</li>
         </ul>
  -      Search the Tomcat 3 bug database
  +      Search the Apache Tomcat 3 bug database
         <a href="http://issues.apache.org/bugzilla/query.cgi?product=Tomcat%203">
         here</a>.<br />
  -      Search the Tomcat 4 bug database
  +      Search the Apache Tomcat 4 bug database
         <a href="http://issues.apache.org/bugzilla/query.cgi?product=Tomcat%204">
         here</a>.<br />
  -      Search the Tomcat 5 bug database
  +      Search the Apache Tomcat 5 bug database
         <a href="http://issues.apache.org/bugzilla/query.cgi?product=Tomcat%205">
         here</a>.<br />
       </p>
  @@ -299,8 +299,8 @@
   <tr>
   <td bgcolor="#828DA6">
   <font face="arial,helvetica,sanserif" color="#ffffff">
  -<a name="Tomcat discussion lists">
  -<strong>Tomcat discussion lists</strong>
  +<a name="Apache Tomcat discussion lists">
  +<strong>Apache Tomcat discussion lists</strong>
   </a>
   </font>
   </td>
  @@ -312,13 +312,13 @@
         Others may have already found a solution.  The <b>tomcat-user</b>
         or <b>tomcat-dev</b> list archives may contain discussions which
         will help you resolve the problem.
  -      Here are four resources to view the Tomcat User List archives:
  +      Here are four resources to view the Apache Tomcat User List archives:
          <a href="http://marc.theaimsgroup.com/?l=tomcat-user&amp;r=1&amp;w=2">Mailing list ARChives</a>,
          <a href="http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=tomcat-user@jakarta.apache.org">Eyebrowse</a>,
          <a href="http://www.mail-archive.com/tomcat-user@jakarta.apache.org">Mail Archive</a>,
          and <a href="http://mikal.org/interests/java/tomcat/">mikal.org</a>.
   
  -      Here are four resources to view the Tomcat Developer List archives
  +      Here are four resources to view the Apache Tomcat Developer List archives
         <a href="http://marc.theaimsgroup.com/?l=tomcat-dev&amp;r=1&amp;w=2">Mailing list ARChives</a>,
         <a href="http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=tomcat-dev@jakarta.apache.org">Eyebrowse</a>,
         <a href="http://www.mail-archive.com/tomcat-dev@jakarta.apache.org/">Mail Archive</a>,
  @@ -345,8 +345,8 @@
   <tr>
   <td bgcolor="#828DA6">
   <font face="arial,helvetica,sanserif" color="#ffffff">
  -<a name="Tomcat on IRC">
  -<strong>Tomcat on IRC</strong>
  +<a name="Apache Tomcat on IRC">
  +<strong>Apache Tomcat on IRC</strong>
   </a>
   </font>
   </td>
  @@ -354,7 +354,7 @@
   <tr>
   <td>
   <blockquote>
  -    <p>An IRC channel dedicated to Tomcat exists on OpenProjects.</p>
  +    <p>An IRC channel dedicated to Apache Tomcat exists on OpenProjects.</p>
   
       <p>
   <code>#tomcat</code> at <code>irc.us.openprojects.net</code>.
  @@ -384,8 +384,8 @@
   <tr>
   <td bgcolor="#525D76">
   <font face="arial,helvetica,sanserif" color="#ffffff">
  -<a name="Reporting a Tomcat bug">
  -<strong>Reporting a Tomcat bug</strong>
  +<a name="Reporting Apache Tomcat bugs">
  +<strong>Reporting Apache Tomcat bugs</strong>
   </a>
   </font>
   </td>
  @@ -395,18 +395,18 @@
   <p>
   <blockquote>
   <p>If after you have exhausted all other resources to resolve a problem
  -with Tomcat you may want to file a bug report.  Please make sure the
  -problem is a bug in Tomcat and not a bug in your web application.</p>
  +with Apache Tomcat you may want to file a bug report.  Please make sure the
  +problem is a bug in Apache Tomcat and not a bug in your web application.</p>
   
   <p>Please make sure you provide as much information as possible. Its
   very hard to fix a bug if the person looking into the problem can't
   reproduce it.  Here is a listing of information which should be included:
   <ul>
     <li>
  -<b>Version</b> - Tomcat version, if from a nightly build, version
  +<b>Version</b> - Apache Tomcat version, if from a nightly build, version
       and date of build.</li>
     <li>
  -<b>Tomcat component</b> - Tomcat component which has the bug.</li>
  +<b>Component</b> - Apache Tomcat component which has the bug.</li>
     <li>
   <b>Platform</b> - Hardward platform Tomcat is running on.</li>
     <li>
  @@ -414,13 +414,13 @@
     <li>
   <b>JVM</b> - JVM Version</li>
     <li>
  -<b>Web Server</b> - Web Server and version, Tomcat Connector and version.</li>
  +<b>Web Server</b> - Web Server and version, Apache Tomcat Connector and version.</li>
     <li>
   <b>Configuration</b> - Attach configuration files if they would help track
       down the bug.</li>
     <li>
   <b>Log file excerpts</b> - Review your logs files, reproduce the bug with
  -    debugging enabled in your Tomcat configuration.  Then submit any relevant
  +    debugging enabled in your Apache Tomcat configuration.  Then submit any relevant
       sections of the log which help document the bug.</li>
     <li>
   <b>Stack Traces</b> - Any stack traces generated by the bug.</li>
  @@ -431,20 +431,20 @@
     <li>
   <b>Bug Fix Patch</b> - A patch created using <code>diff -u</code> which
       fixes the bug.
  -    (If you have found a bug fix which can be applied to the Tomcat code)</li>
  +    (If you have found a bug fix which can be applied to the Apache Tomcat code)</li>
     <li>
   <b>Miscellaneous</b> - Any other information you feel will help track
       down the problem.  For example other Java API's and versions being used
  -    with Tomcat.</li>
  +    with Apache Tomcat.</li>
   </ul>
   
  -Report a Tomcat 5 bug
  +Report an Apache Tomcat 5 bug
   <a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%205">
   here</a>.<br />
  -Report a Tomcat 4 bug
  +Report an Apache Tomcat 4 bug
   <a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%204">
   here</a>.<br />
  -Report a Tomcat 3 bug
  +Report an Apache Tomcat 3 bug
   <a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%203">
   here</a>.<br />
   </p>
  
  
  
  1.79      +54 -54    jakarta-tomcat-site/docs/index.html
  
  Index: index.html
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-site/docs/index.html,v
  retrieving revision 1.78
  retrieving revision 1.79
  diff -u -r1.78 -r1.79
  --- index.html	3 May 2005 13:48:12 -0000	1.78
  +++ index.html	16 May 2005 11:19:38 -0000	1.79
  @@ -2,7 +2,7 @@
   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
   <html>
   <head>
  -<title>The Jakarta Site - Apache Jakarta Tomcat</title>
  +<title>The Jakarta Site - Apache Tomcat</title>
   <meta value="Marc A. Saegesser" name="author" />
   <meta value="marc.saegesser@apropos.com" name="email" />
   <meta value="Yoav Shapira" name="author" />
  @@ -35,7 +35,7 @@
   <!--LEFT SIDE NAVIGATION-->
   <td nowrap="true" valign="top" width="20%">
   <p>
  -<strong>Tomcat</strong>
  +<strong>Apache Tomcat</strong>
   </p>
   <ul>
   <li>
  @@ -59,16 +59,16 @@
   </p>
   <ul>
   <li>
  -<a href="./tomcat-5.5-doc/index.html">Tomcat 5.5</a>
  +<a href="./tomcat-5.5-doc/index.html">Apache Tomcat 5.5</a>
   </li>
   <li>
  -<a href="./tomcat-5.0-doc/index.html">Tomcat 5.0</a>
  +<a href="./tomcat-5.0-doc/index.html">Apache Tomcat 5.0</a>
   </li>
   <li>
  -<a href="./tomcat-4.1-doc/index.html">Tomcat 4.1</a>
  +<a href="./tomcat-4.1-doc/index.html">Apache Tomcat 4.1</a>
   </li>
   <li>
  -<a href="./tomcat-3.3-doc/index.html">Tomcat 3.3</a>
  +<a href="./tomcat-3.3-doc/index.html">Apache Tomcat 3.3</a>
   </li>
   </ul>
   <p>
  @@ -79,13 +79,13 @@
   <a href="http://jakarta.apache.org/site/downloads/downloads_tomcat-5.cgi">Current Releases</a>
   </li>
   <li>
  -<a href="http://archive.apache.org/dist/jakarta/tomcat-5/">Tomcat 5.x</a>
  +<a href="http://archive.apache.org/dist/jakarta/tomcat-5/">Apache Tomcat 5.x</a>
   </li>
   <li>
  -<a href="http://archive.apache.org/dist/jakarta/tomcat-4/">Tomcat 4.x</a>
  +<a href="http://archive.apache.org/dist/jakarta/tomcat-4/">Apache Tomcat 4.x</a>
   </li>
   <li>
  -<a href="http://archive.apache.org/dist/jakarta/tomcat-3/">Tomcat 3.x</a>
  +<a href="http://archive.apache.org/dist/jakarta/tomcat-3/">Apache Tomcat 3.x</a>
   </li>
   </ul>
   <p>
  @@ -93,10 +93,10 @@
   </p>
   <ul>
   <li>
  -<a href="./tomcat-4.0-doc/index.html">Tomcat 4.0</a>
  +<a href="./tomcat-4.0-doc/index.html">Apache Tomcat 4.0</a>
   </li>
   <li>
  -<a href="./tomcat-3.2-doc/index.html">Tomcat 3.2</a>
  +<a href="./tomcat-3.2-doc/index.html">Apache Tomcat 3.2</a>
   </li>
   </ul>
   <p>
  @@ -160,8 +160,8 @@
   <tr>
   <td bgcolor="#525D76">
   <font face="arial,helvetica,sanserif" color="#ffffff">
  -<a name="Apache Jakarta Tomcat">
  -<strong>Apache Jakarta Tomcat</strong>
  +<a name="Apache Tomcat">
  +<strong>Apache Tomcat</strong>
   </a>
   </font>
   </td>
  @@ -171,16 +171,16 @@
   <p>
   <blockquote>
   
  -<p>Tomcat is the servlet container that is used in the official
  +<p>Apache Tomcat is the servlet container that is used in the official
   Reference Implementation for the
   <a href="http://java.sun.com/products/servlets">Java Servlet</a> and <a href="http://java.sun.com/products/jsp">JavaServer Pages</a> technologies.  
   The Java Servlet and JavaServer Pages specifications are developed by Sun 
   under the <a href="http://jcp.org/en/introduction/overview">Java 
   Community Process</a>.  </p> 
   
  -<p>Tomcat is developed in an open and participatory environment and 
  +<p>Apache Tomcat is developed in an open and participatory environment and 
   released under the <a href="http://www.apache.org/licenses">Apache 
  -Software License</a>.  Tomcat is intended to be a collaboration of the 
  +Software License</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="/site/getinvolved.html">click here</a>.  </p> 
  @@ -199,8 +199,8 @@
   <tr>
   <td bgcolor="#525D76">
   <font face="arial,helvetica,sanserif" color="#ffffff">
  -<a name="Tomcat Versions">
  -<strong>Tomcat Versions</strong>
  +<a name="Apache Tomcat Versions">
  +<strong>Apache Tomcat Versions</strong>
   </a>
   </font>
   </td>
  @@ -209,7 +209,7 @@
   <td>
   <p>
   <blockquote>
  -<p>For the impatient, current Tomcat production quality releases vs.
  +<p>For the impatient, current Apache Tomcat production quality releases vs.
   Servlet/JSP specifications:</p>
   
   <table class="detail-table">
  @@ -222,7 +222,7 @@
   </td>
     <td valign="top" bgcolor="#039acc">
   <font face="arial,helvetica,sanserif" size="-1" color="#000000">
  -<strong>Tomcat version</strong>
  +<strong>Apache Tomcat version</strong>
   </font>
   </td>
   </tr>
  @@ -261,8 +261,8 @@
   the associated release notes.</p> 
   
   <p>Please note that alhough we offer downloads and documentation of older
  -releases, such as Tomcat 3.x and 4.x, we strongly encourage users to use the
  -latest stable version of Tomcat whenever possible.  We recognize that upgrading
  +releases, such as Apache Tomcat 3.x and 4.x, we strongly encourage users to use the
  +latest stable version of Apache Tomcat whenever possible.  We recognize that upgrading
   across major version may not be a trivial task, and some support is still
   offered on the mailing list for users of old versions.  However, because of the
   community-driven support approach, the older your version the less people would
  @@ -273,8 +273,8 @@
   <tr>
   <td bgcolor="#828DA6">
   <font face="arial,helvetica,sanserif" color="#ffffff">
  -<a name="Tomcat 5.x">
  -<strong>Tomcat 5.x</strong>
  +<a name="Apache Tomcat 5.x">
  +<strong>Apache Tomcat 5.x</strong>
   </a>
   </font>
   </td>
  @@ -284,16 +284,16 @@
   <blockquote>
   
   <p>
  -<strong>Tomcat 5.5.x</strong>.  Tomcat 5.5 is the current focus of
  +<strong>Apache Tomcat 5.5.x</strong>.  Apache Tomcat 5.5 is the current focus of
   development.  While it supports the same Servlet and JSP
  -Specification versions as Tomcat 5.0.x, there are significant changes
  +Specification versions as Apache Tomcat 5.0.x, there are significant changes
   in many areas under the hood, resulting in improved performance, stability,
  -and total cost of ownership.  Please refer to the Tomcat 5.5 Changelog
  +and total cost of ownership.  Please refer to the Apache Tomcat 5.5 Changelog
   for details.
   </p>
   
   <p>
  -<strong>Tomcat 5.0.x</strong>.  Tomcat 5.0 improves on Tomcat 4.1 in many
  +<strong>Apache Tomcat 5.0.x</strong>.  Apache Tomcat 5.0 improves on Apache Tomcat 4.1 in many
   ways, including:
   <ul>
   <li>Performance optimizations and reduced garbage collection</li>
  @@ -304,7 +304,7 @@
   <li>Scalability and reliability enhancements</li>
   <li>Improved Taglibs handling, including advanced pooling and tag plugins</li>
   <li>Improved platform integration, with native Windows and Unix wrappers</li>
  -<li>Embedding of Tomcat using JMX</li>
  +<li>Embedding using JMX</li>
   <li>Enhanced Security Manager support</li>
   <li>Integrated session clustering</li>
   <li>Expanded documentation</li>
  @@ -325,8 +325,8 @@
   <tr>
   <td bgcolor="#828DA6">
   <font face="arial,helvetica,sanserif" color="#ffffff">
  -<a name="Tomcat 4.x">
  -<strong>Tomcat 4.x</strong>
  +<a name="Apache Tomcat 4.x">
  +<strong>Apache Tomcat 4.x</strong>
   </a>
   </font>
   </td>
  @@ -336,19 +336,19 @@
   <blockquote>
   
   <p>
  -<strong>Tomcat 4.x</strong> implements a new servlet container (called
  +<strong>Apache Tomcat 4.x</strong> implements a new servlet container (called
   Catalina) that is based on completely new architecture.  The 4.x releases
   implement the <strong>Servlet 2.3</strong> and <strong>JSP 1.2</strong>
   specifications.</p>
   
   <p>
  -<strong>We encourage all users to upgrade to Tomcat 5.x whenever
  +<strong>We encourage all users to upgrade to Apache Tomcat 5.x whenever
   possible.</strong>
   </p>
   
   <p>
  -<strong>Tomcat 4.1.x</strong>. Tomcat 4.1 is a refactoring 
  -of Tomcat 4.0.x, and contains significant enhancements, including:
  +<strong>Apache Tomcat 4.1.x</strong>. Apache Tomcat 4.1 is a refactoring 
  +of Apache Tomcat 4.0.x, and contains significant enhancements, including:
   <ul>
   <li>JMX based administration features</li>
   <li>JSP and Struts based administration web application</li>
  @@ -363,16 +363,16 @@
   </p>
   
   <p>
  -<strong>Tomcat 4.0.x</strong>.  Tomcat 4.0.6 is the old production
  +<strong>Apache Tomcat 4.0.x</strong>.  Apache Tomcat 4.0.6 is the old production
   quality release.  The 4.0 servlet
   container (Catalina) has been developed from the ground up for flexibility and
   performance.  Version 4.0 implements the final released versions of the Servlet
  -2.3 and JSP 1.2 specifications.  As required by the specifications, Tomcat 4.0
  +2.3 and JSP 1.2 specifications.  As required by the specifications, Apache Tomcat 4.0
   also supports web applications built for the Servlet 2.2 and JSP 1.1
   specifications with no changes.</p>
   
   <p>
  -<strong>We encourage all users to upgrade to Tomcat 5.x whenever
  +<strong>We encourage all users to upgrade to Apache Tomcat 5.x whenever
   possible.</strong>
   </p>
   
  @@ -390,8 +390,8 @@
   <tr>
   <td bgcolor="#828DA6">
   <font face="arial,helvetica,sanserif" color="#ffffff">
  -<a name="Tomcat 3.x">
  -<strong>Tomcat 3.x</strong>
  +<a name="Apache Tomcat 3.x">
  +<strong>Apache Tomcat 3.x</strong>
   </a>
   </font>
   </td>
  @@ -400,13 +400,13 @@
   <td>
   <blockquote>
   
  -<p>There are several versions of <strong>Tomcat 3.x</strong> currently
  +<p>There are several versions of <strong>Apache Tomcat 3.x</strong> currently
   available for download:</p>
   
   <ul>
   <li>Version <strong>3.3</strong> is the current production quality release for
  -the Servlet 2.2 and JSP 1.1 specifications.  Tomcat 3.3 is the latest
  -continuation of the Tomcat 3.x architecture and it is more advanced then 3.2.4,
  +the Servlet 2.2 and JSP 1.1 specifications.  Apache Tomcat 3.3 is the latest
  +continuation of the Apache Tomcat 3.x architecture and it is more advanced then 3.2.4,
   which is the 'old' production quality release.</li>
   <li>Version 3.2.4 is the 'old' production quality release and is now in
   maintenance only mode.</li>
  @@ -414,14 +414,14 @@
   </ul>
   
   <p>
  -All <strong>Tomcat 3.x</strong> releases trace their heritage back to the
  +All <strong>Apache Tomcat 3.x</strong> releases trace their heritage back to the
   original Servlet and JSP implementations that Sun donated to the Apache
   Software Foundation.  The 3.x versions all implement the <strong>Servlet
   2.2</strong> and <strong>JSP 1.1</strong> specifications.
   </p>
   
   <p>
  -<strong>Tomcat 3.3.x</strong>. Version 3.3.2 is the current production 
  +<strong>Apache Tomcat 3.3.x</strong>. Version 3.3.2 is the current production 
   quality release. It continues the refactoring that was begun in version 3.2 and
   carries it to its logical conclusion.  Version 3.3 provides a much more modular
   design and allows the servlet container to be customized by adding and removing
  @@ -429,31 +429,31 @@
   contains many performance improvements.</p> 
   
   <p>
  -<strong>Tomcat 3.2.x</strong>.  Version 3.2 added few new features 
  +<strong>Apache Tomcat 3.2.x</strong>.  Version 3.2 added few new features 
   since 3.1; the major effort was a refactoring of the internals to improve 
   performance and stability.  The 3.2.1 release, like 3.1.1, was a security 
   patch.  Version 3.2.2 fixed a large number of bugs and all known 
   specification compliance issues.  Version 3.2.3 was a security update that 
   closes a serious security hole.  Version 3.2.4 is a minor bug fix release.  
  -All users of Tomcat versions prior to 3.2.3 should updgrade as soon as 
  +All users of Apache Tomcat versions prior to 3.2.3 should updgrade as soon as 
   possible.  With the exception of fixes for critical security related bugs, 
  -development on the Tomcat 3.2.x branch has stopped.</p> 
  +development on the Apache Tomcat 3.2.x branch has stopped.</p> 
   
   <p>
  -<strong>Tomcat 3.1.x</strong>.  The 3.1 release contained several 
  -improvements over Tomcat 3.0, including servlet reloading, WAR file 
  +<strong>Apache Tomcat 3.1.x</strong>.  The 3.1 release contained several 
  +improvements over Apache Tomcat 3.0, including servlet reloading, WAR file 
   support and added connectors for the IIS and Netscape web servers.  The 
   latest maintenance release, 3.1.1, contained fixes for security problems.  
  -There is no active development ongoing for Tomcat 3.1.x.  Users of Tomcat 
  +There is no active development ongoing for Apache Tomcat 3.1.x.  Users of Apache Tomcat 
   3.1 should update to 3.1.1 to close the security holes and they are 
  -strongly encouraged to migrate to the current production release, Tomcat 
  +strongly encouraged to migrate to the current production release, Apache Tomcat 
   3.3.</p> 
   
   <p>
  -<strong>Tomcat 3.0.x</strong>. Initial Tomcat release.</p>
  +<strong>Apache Tomcat 3.0.x</strong>. Initial Apache Tomcat release.</p>
   
   <p>
  -<strong>We encourage all users to upgrade to Tomcat 5.x whenever
  +<strong>We encourage all users to upgrade to Apache Tomcat 5.x whenever
   possible.</strong>
   </p>
   
  
  
  
  1.30      +1 -1      jakarta-tomcat-site/docs/irc.html
  
  Index: irc.html
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-site/docs/irc.html,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- irc.html	3 May 2005 13:48:12 -0000	1.29
  +++ irc.html	16 May 2005 11:19:38 -0000	1.30
  @@ -2,7 +2,7 @@
   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
   <html>
   <head>
  -<title>The Jakarta Site - Tomcat on IRC</title>
  +<title>The Jakarta Site - Apache Tomcat on IRC</title>
   <meta value="Marc A. Saegesser" name="author" />
   <meta value="marc.saegesser@apropos.com" name="email" />
   </head>
  
  
  
  1.35      +2 -2      jakarta-tomcat-site/docs/resources.html
  
  Index: resources.html
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-site/docs/resources.html,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- resources.html	3 May 2005 13:48:12 -0000	1.34
  +++ resources.html	16 May 2005 11:19:38 -0000	1.35
  @@ -2,7 +2,7 @@
   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
   <html>
   <head>
  -<title>The Jakarta Site - Tomcat Resources</title>
  +<title>The Jakarta Site - Apache Tomcat Resources</title>
   <meta value="Remy Maucherat" name="author" />
   <meta value="remm@apache.org" name="email" />
   </head>
  @@ -221,7 +221,7 @@
   <a href="http://johnturner.com/howto/apache-tomcat-howto.html">mod_jk HOWTOs</a>
   </b>, 
         by John Turner.  Please note that this is one of many documents explaining how to 
  -      connect Apache HTTPD and Tomcat in various environment.  A list is maintained in
  +      connect Apache HTTP Server and Apache Tomcat in various environment.  A list is maintained in
         the tomcat <a href="http://wiki.apache.org/jakarta-tomcat/Tomcat_2fLinks">wiki links page.</a>
       </li>
       <li>
  
  
  
  1.5       +1 -0      jakarta-tomcat-site/docs/faq/development.html
  
  Index: development.html
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-site/docs/faq/development.html,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- development.html	23 Mar 2005 15:52:38 -0000	1.4
  +++ development.html	16 May 2005 11:19:38 -0000	1.5
  @@ -36,6 +36,7 @@
       <p>
       The short answer is to add the following options when the JVM is started:<br>
       <code>-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n</code><br>
  +
       There are a number of ways you can do this depending on how you normally start
       Tomcat:
       <ul>
  
  
  
  1.5       +1 -0      jakarta-tomcat-site/docs/faq/printer/development.html
  
  Index: development.html
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-site/docs/faq/printer/development.html,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- development.html	23 Mar 2005 15:52:38 -0000	1.4
  +++ development.html	16 May 2005 11:19:38 -0000	1.5
  @@ -35,6 +35,7 @@
       <p>
       The short answer is to add the following options when the JVM is started:<br>
       <code>-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n</code><br>
  +
       There are a number of ways you can do this depending on how you normally start
       Tomcat:
       <ul>
  
  
  
  1.10      +28 -28    jakarta-tomcat-site/xdocs/bugreport.xml
  
  Index: bugreport.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-site/xdocs/bugreport.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- bugreport.xml	1 Jan 2005 12:38:39 -0000	1.9
  +++ bugreport.xml	16 May 2005 11:19:38 -0000	1.10
  @@ -3,15 +3,15 @@
   
     <properties>
       <author>Glenn L. Nielsen</author>
  -    <title>Report a Tomcat Bug</title>
  +    <title>Reporting Apache Tomcat Bugs</title>
     </properties>
   
   <body>
   
   <section name="Before you report a bug">
  -<p>The Tomcat community consists of those who use Tomcat, help answer
  +<p>The Apache Tomcat community consists of those who use Apache Tomcat, help answer
   questions on discussions lists, contribute documentation and patches,
  -and those who develop and maintain the code for Tomcat.  Almost all those
  +and those who develop and maintain the code for Apache Tomcat.  Almost all those
   who assist on a day to day basis resolving bug reports do this for a
   wide variety of reasons, and almost all of them do this on their own time.</p>
   
  @@ -20,7 +20,7 @@
   privately by email to <a href="mailto:security@apache.org">security@apache.org</a>.
   </p>
   
  -<p>Many bugs reported end up not being a bug in the Tomcat code, but are
  +<p>Many bugs reported end up not being a bug in the Apache Tomcat code, but are
   due to misconfiguration, problems caused by installed applications, the
   operating system, etc.
   <ul>
  @@ -32,18 +32,18 @@
   </p>
   </section>
   
  -<section name="Resources to help resolve Tomcat problems">
  +<section name="Resources to help resolve Apache Tomcat problems">
   <p>Here are some resources you can use to help you resolve the
   problem you are having before reporting a bug.</p>
   
     <subsection name="Problem trouble shooting">
       <p>
       <li><b>Documentation</b> - Review the documentation for the version
  -      of Tomcat you are using.  The problem you are having may already
  +      of Apache Tomcat you are using.  The problem you are having may already
         be addressed in the docs.</li>
  -    <li><b>Logs</b> - The logs which Tomcat generates can be a valuable
  +    <li><b>Logs</b> - The logs which Apache Tomcat generates can be a valuable
         resource when trying to diagnose a problem.  Please review them.
  -      You may want to enable debug output in your Tomcat configuration
  +      You may want to enable debug output in your Apache Tomcat configuration
         so that you have more information to help diagnose the problem.</li>
       <li><b>FAQ's</b> - Search Frequently Asked Question documents. FAQ's
         for all Jakarta projects can be found
  @@ -60,30 +60,30 @@
           <li>Someone else may have reported the bug, you could add supporting
           information to help reproduce and resolve the bug.</li>
         </ul>
  -      Search the Tomcat 3 bug database
  +      Search the Apache Tomcat 3 bug database
         <a href="http://issues.apache.org/bugzilla/query.cgi?product=Tomcat%203">
         here</a>.<br />
  -      Search the Tomcat 4 bug database
  +      Search the Apache Tomcat 4 bug database
         <a href="http://issues.apache.org/bugzilla/query.cgi?product=Tomcat%204">
         here</a>.<br />
  -      Search the Tomcat 5 bug database
  +      Search the Apache Tomcat 5 bug database
         <a href="http://issues.apache.org/bugzilla/query.cgi?product=Tomcat%205">
         here</a>.<br />
       </p>
     </subsection>
   
  -  <subsection name="Tomcat discussion lists">
  +  <subsection name="Apache Tomcat discussion lists">
       <p>It is very likely you are not the first to run into a problem.
         Others may have already found a solution.  The <b>tomcat-user</b>
         or <b>tomcat-dev</b> list archives may contain discussions which
         will help you resolve the problem.
  -      Here are four resources to view the Tomcat User List archives:
  +      Here are four resources to view the Apache Tomcat User List archives:
          <a href="http://marc.theaimsgroup.com/?l=tomcat-user&amp;r=1&amp;w=2">Mailing list ARChives</a>,
          <a href="http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=tomcat-user@jakarta.apache.org">Eyebrowse</a>,
          <a href="http://www.mail-archive.com/tomcat-user@jakarta.apache.org">Mail Archive</a>,
          and <a href="http://mikal.org/interests/java/tomcat/">mikal.org</a>.
   
  -      Here are four resources to view the Tomcat Developer List archives
  +      Here are four resources to view the Apache Tomcat Developer List archives
         <a href="http://marc.theaimsgroup.com/?l=tomcat-dev&amp;r=1&amp;w=2">Mailing list ARChives</a>,
         <a href="http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=tomcat-dev@jakarta.apache.org">Eyebrowse</a>,
         <a href="http://www.mail-archive.com/tomcat-dev@jakarta.apache.org/">Mail Archive</a>,
  @@ -98,8 +98,8 @@
       </p>
     </subsection>
   
  -  <subsection name="Tomcat on IRC">
  -    <p>An IRC channel dedicated to Tomcat exists on OpenProjects.</p>
  +  <subsection name="Apache Tomcat on IRC">
  +    <p>An IRC channel dedicated to Apache Tomcat exists on OpenProjects.</p>
   
       <p><code>#tomcat</code> at <code>irc.us.openprojects.net</code>.
       Click <a href="irc://irc.us.openprojects.net/tomcat">here</a> to
  @@ -108,26 +108,26 @@
   
   </section>
   
  -<section name="Reporting a Tomcat bug">
  +<section name="Reporting Apache Tomcat bugs">
   <p>If after you have exhausted all other resources to resolve a problem
  -with Tomcat you may want to file a bug report.  Please make sure the
  -problem is a bug in Tomcat and not a bug in your web application.</p>
  +with Apache Tomcat you may want to file a bug report.  Please make sure the
  +problem is a bug in Apache Tomcat and not a bug in your web application.</p>
   
   <p>Please make sure you provide as much information as possible. Its
   very hard to fix a bug if the person looking into the problem can't
   reproduce it.  Here is a listing of information which should be included:
   <ul>
  -  <li><b>Version</b> - Tomcat version, if from a nightly build, version
  +  <li><b>Version</b> - Apache Tomcat version, if from a nightly build, version
       and date of build.</li>
  -  <li><b>Tomcat component</b> - Tomcat component which has the bug.</li>
  +  <li><b>Component</b> - Apache Tomcat component which has the bug.</li>
     <li><b>Platform</b> - Hardward platform Tomcat is running on.</li>
     <li><b>OS</b> - Computer operating system and version.</li>
     <li><b>JVM</b> - JVM Version</li>
  -  <li><b>Web Server</b> - Web Server and version, Tomcat Connector and version.</li>
  +  <li><b>Web Server</b> - Web Server and version, Apache Tomcat Connector and version.</li>
     <li><b>Configuration</b> - Attach configuration files if they would help track
       down the bug.</li>
     <li><b>Log file excerpts</b> - Review your logs files, reproduce the bug with
  -    debugging enabled in your Tomcat configuration.  Then submit any relevant
  +    debugging enabled in your Apache Tomcat configuration.  Then submit any relevant
       sections of the log which help document the bug.</li>
     <li><b>Stack Traces</b> - Any stack traces generated by the bug.</li>
     <li><b>Example</b> - Example configuration files or web applications which
  @@ -135,19 +135,19 @@
       please try to make it as simple as possible.</li>
     <li><b>Bug Fix Patch</b> - A patch created using <code>diff -u</code> which
       fixes the bug.
  -    (If you have found a bug fix which can be applied to the Tomcat code)</li>
  +    (If you have found a bug fix which can be applied to the Apache Tomcat code)</li>
     <li><b>Miscellaneous</b> - Any other information you feel will help track
       down the problem.  For example other Java API's and versions being used
  -    with Tomcat.</li>
  +    with Apache Tomcat.</li>
   </ul>
   
  -Report a Tomcat 5 bug
  +Report an Apache Tomcat 5 bug
   <a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%205">
   here</a>.<br />
  -Report a Tomcat 4 bug
  +Report an Apache Tomcat 4 bug
   <a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%204">
   here</a>.<br />
  -Report a Tomcat 3 bug
  +Report an Apache Tomcat 3 bug
   <a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%203">
   here</a>.<br />
   </p>
  
  
  
  1.63      +39 -39    jakarta-tomcat-site/xdocs/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-site/xdocs/index.xml,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- index.xml	13 Apr 2005 01:19:46 -0000	1.62
  +++ index.xml	16 May 2005 11:19:38 -0000	1.63
  @@ -4,14 +4,14 @@
     <properties>
       <author email="marc.saegesser@apropos.com">Marc A. Saegesser</author>
       <author email="yoavs@apache.org">Yoav Shapira</author>
  -    <title>Apache Jakarta Tomcat</title>
  +    <title>Apache Tomcat</title>
     </properties>
   
   <body>
   
  -<section name="Apache Jakarta Tomcat">
  +<section name="Apache Tomcat">
   
  -<p>Tomcat is the servlet container that is used in the official
  +<p>Apache Tomcat is the servlet container that is used in the official
   Reference Implementation for the
   <a href="http://java.sun.com/products/servlets">Java Servlet</a> and <a 
   href="http://java.sun.com/products/jsp">JavaServer Pages</a> technologies.  
  @@ -19,24 +19,24 @@
   under the <a href="http://jcp.org/en/introduction/overview">Java 
   Community Process</a>.  </p> 
   
  -<p>Tomcat is developed in an open and participatory environment and 
  +<p>Apache Tomcat is developed in an open and participatory environment and 
   released under the <a href="http://www.apache.org/licenses">Apache 
  -Software License</a>.  Tomcat is intended to be a collaboration of the 
  +Software License</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="/site/getinvolved.html">click here</a>.  </p> 
   
   </section>
   
  -<section name="Tomcat Versions">
  -<p>For the impatient, current Tomcat production quality releases vs.
  +<section name="Apache Tomcat Versions">
  +<p>For the impatient, current Apache Tomcat production quality releases vs.
   Servlet/JSP specifications:</p>
   
   <table class="detail-table">
   
   <tr>
     <th><strong>Servlet/JSP Spec</strong></th>
  -  <th><strong>Tomcat version</strong></th>
  +  <th><strong>Apache Tomcat version</strong></th>
   </tr>
   
   <tr>
  @@ -61,25 +61,25 @@
   the associated release notes.</p> 
   
   <p>Please note that alhough we offer downloads and documentation of older
  -releases, such as Tomcat 3.x and 4.x, we strongly encourage users to use the
  -latest stable version of Tomcat whenever possible.  We recognize that upgrading
  +releases, such as Apache Tomcat 3.x and 4.x, we strongly encourage users to use the
  +latest stable version of Apache Tomcat whenever possible.  We recognize that upgrading
   across major version may not be a trivial task, and some support is still
   offered on the mailing list for users of old versions.  However, because of the
   community-driven support approach, the older your version the less people would
   be interested or able to support you.
   </p>
   
  -<subsection name="Tomcat 5.x">
  +<subsection name="Apache Tomcat 5.x">
   
  -<p><strong>Tomcat 5.5.x</strong>.  Tomcat 5.5 is the current focus of
  +<p><strong>Apache Tomcat 5.5.x</strong>.  Apache Tomcat 5.5 is the current focus of
   development.  While it supports the same Servlet and JSP
  -Specification versions as Tomcat 5.0.x, there are significant changes
  +Specification versions as Apache Tomcat 5.0.x, there are significant changes
   in many areas under the hood, resulting in improved performance, stability,
  -and total cost of ownership.  Please refer to the Tomcat 5.5 Changelog
  +and total cost of ownership.  Please refer to the Apache Tomcat 5.5 Changelog
   for details.
   </p>
   
  -<p><strong>Tomcat 5.0.x</strong>.  Tomcat 5.0 improves on Tomcat 4.1 in many
  +<p><strong>Apache Tomcat 5.0.x</strong>.  Apache Tomcat 5.0 improves on Apache Tomcat 4.1 in many
   ways, including:
   <ul>
   <li>Performance optimizations and reduced garbage collection</li>
  @@ -90,7 +90,7 @@
   <li>Scalability and reliability enhancements</li>
   <li>Improved Taglibs handling, including advanced pooling and tag plugins</li>
   <li>Improved platform integration, with native Windows and Unix wrappers</li>
  -<li>Embedding of Tomcat using JMX</li>
  +<li>Embedding using JMX</li>
   <li>Enhanced Security Manager support</li>
   <li>Integrated session clustering</li>
   <li>Expanded documentation</li>
  @@ -99,18 +99,18 @@
   
   </subsection>
   
  -<subsection name="Tomcat 4.x">
  +<subsection name="Apache Tomcat 4.x">
   
  -<p><strong>Tomcat 4.x</strong> implements a new servlet container (called
  +<p><strong>Apache Tomcat 4.x</strong> implements a new servlet container (called
   Catalina) that is based on completely new architecture.  The 4.x releases
   implement the <strong>Servlet 2.3</strong> and <strong>JSP 1.2</strong>
   specifications.</p>
   
  -<p><strong>We encourage all users to upgrade to Tomcat 5.x whenever
  +<p><strong>We encourage all users to upgrade to Apache Tomcat 5.x whenever
   possible.</strong></p>
   
  -<p><strong>Tomcat 4.1.x</strong>. Tomcat 4.1 is a refactoring 
  -of Tomcat 4.0.x, and contains significant enhancements, including:
  +<p><strong>Apache Tomcat 4.1.x</strong>. Apache Tomcat 4.1 is a refactoring 
  +of Apache Tomcat 4.0.x, and contains significant enhancements, including:
   <ul>
   <li>JMX based administration features</li>
   <li>JSP and Struts based administration web application</li>
  @@ -124,28 +124,28 @@
   </ul>
   </p>
   
  -<p><strong>Tomcat 4.0.x</strong>.  Tomcat 4.0.6 is the old production
  +<p><strong>Apache Tomcat 4.0.x</strong>.  Apache Tomcat 4.0.6 is the old production
   quality release.  The 4.0 servlet
   container (Catalina) has been developed from the ground up for flexibility and
   performance.  Version 4.0 implements the final released versions of the Servlet
  -2.3 and JSP 1.2 specifications.  As required by the specifications, Tomcat 4.0
  +2.3 and JSP 1.2 specifications.  As required by the specifications, Apache Tomcat 4.0
   also supports web applications built for the Servlet 2.2 and JSP 1.1
   specifications with no changes.</p>
   
  -<p><strong>We encourage all users to upgrade to Tomcat 5.x whenever
  +<p><strong>We encourage all users to upgrade to Apache Tomcat 5.x whenever
   possible.</strong></p>
   
   </subsection>
   
  -<subsection name="Tomcat 3.x">
  +<subsection name="Apache Tomcat 3.x">
   
  -<p>There are several versions of <strong>Tomcat 3.x</strong> currently
  +<p>There are several versions of <strong>Apache Tomcat 3.x</strong> currently
   available for download:</p>
   
   <ul>
   <li>Version <strong>3.3</strong> is the current production quality release for
  -the Servlet 2.2 and JSP 1.1 specifications.  Tomcat 3.3 is the latest
  -continuation of the Tomcat 3.x architecture and it is more advanced then 3.2.4,
  +the Servlet 2.2 and JSP 1.1 specifications.  Apache Tomcat 3.3 is the latest
  +continuation of the Apache Tomcat 3.x architecture and it is more advanced then 3.2.4,
   which is the 'old' production quality release.</li>
   <li>Version 3.2.4 is the 'old' production quality release and is now in
   maintenance only mode.</li>
  @@ -153,41 +153,41 @@
   </ul>
   
   <p>
  -All <strong>Tomcat 3.x</strong> releases trace their heritage back to the
  +All <strong>Apache Tomcat 3.x</strong> releases trace their heritage back to the
   original Servlet and JSP implementations that Sun donated to the Apache
   Software Foundation.  The 3.x versions all implement the <strong>Servlet
   2.2</strong> and <strong>JSP 1.1</strong> specifications.
   </p>
   
  -<p><strong>Tomcat 3.3.x</strong>. Version 3.3.2 is the current production 
  +<p><strong>Apache Tomcat 3.3.x</strong>. Version 3.3.2 is the current production 
   quality release. It continues the refactoring that was begun in version 3.2 and
   carries it to its logical conclusion.  Version 3.3 provides a much more modular
   design and allows the servlet container to be customized by adding and removing
   modules that control the processing of servlet requests.  This version also
   contains many performance improvements.</p> 
   
  -<p><strong>Tomcat 3.2.x</strong>.  Version 3.2 added few new features 
  +<p><strong>Apache Tomcat 3.2.x</strong>.  Version 3.2 added few new features 
   since 3.1; the major effort was a refactoring of the internals to improve 
   performance and stability.  The 3.2.1 release, like 3.1.1, was a security 
   patch.  Version 3.2.2 fixed a large number of bugs and all known 
   specification compliance issues.  Version 3.2.3 was a security update that 
   closes a serious security hole.  Version 3.2.4 is a minor bug fix release.  
  -All users of Tomcat versions prior to 3.2.3 should updgrade as soon as 
  +All users of Apache Tomcat versions prior to 3.2.3 should updgrade as soon as 
   possible.  With the exception of fixes for critical security related bugs, 
  -development on the Tomcat 3.2.x branch has stopped.</p> 
  +development on the Apache Tomcat 3.2.x branch has stopped.</p> 
   
  -<p><strong>Tomcat 3.1.x</strong>.  The 3.1 release contained several 
  -improvements over Tomcat 3.0, including servlet reloading, WAR file 
  +<p><strong>Apache Tomcat 3.1.x</strong>.  The 3.1 release contained several 
  +improvements over Apache Tomcat 3.0, including servlet reloading, WAR file 
   support and added connectors for the IIS and Netscape web servers.  The 
   latest maintenance release, 3.1.1, contained fixes for security problems.  
  -There is no active development ongoing for Tomcat 3.1.x.  Users of Tomcat 
  +There is no active development ongoing for Apache Tomcat 3.1.x.  Users of Apache Tomcat 
   3.1 should update to 3.1.1 to close the security holes and they are 
  -strongly encouraged to migrate to the current production release, Tomcat 
  +strongly encouraged to migrate to the current production release, Apache Tomcat 
   3.3.</p> 
   
  -<p><strong>Tomcat 3.0.x</strong>. Initial Tomcat release.</p>
  +<p><strong>Apache Tomcat 3.0.x</strong>. Initial Apache Tomcat release.</p>
   
  -<p><strong>We encourage all users to upgrade to Tomcat 5.x whenever
  +<p><strong>We encourage all users to upgrade to Apache Tomcat 5.x whenever
   possible.</strong></p>
   
   </subsection>
  
  
  
  1.6       +1 -1      jakarta-tomcat-site/xdocs/irc.xml
  
  Index: irc.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-site/xdocs/irc.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- irc.xml	15 Jan 2003 16:46:01 -0000	1.5
  +++ irc.xml	16 May 2005 11:19:38 -0000	1.6
  @@ -3,7 +3,7 @@
   
     <properties>
       <author email="marc.saegesser@apropos.com">Marc A. Saegesser</author>
  -    <title>Tomcat on IRC</title>
  +    <title>Apache Tomcat on IRC</title>
     </properties>
   
   <body>
  
  
  
  1.13      +2 -2      jakarta-tomcat-site/xdocs/resources.xml
  
  Index: resources.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-site/xdocs/resources.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- resources.xml	3 Feb 2005 15:12:27 -0000	1.12
  +++ resources.xml	16 May 2005 11:19:38 -0000	1.13
  @@ -3,7 +3,7 @@
   
     <properties>
       <author email="remm@apache.org">Remy Maucherat</author>
  -    <title>Tomcat Resources</title>
  +    <title>Apache Tomcat Resources</title>
     </properties>
   
   <body>
  @@ -37,7 +37,7 @@
       <li>
         <b><a href="http://johnturner.com/howto/apache-tomcat-howto.html">mod_jk HOWTOs</a></b>, 
         by John Turner.  Please note that this is one of many documents explaining how to 
  -      connect Apache HTTPD and Tomcat in various environment.  A list is maintained in
  +      connect Apache HTTP Server and Apache Tomcat in various environment.  A list is maintained in
         the tomcat <a href="http://wiki.apache.org/jakarta-tomcat/Tomcat_2fLinks">wiki links page.</a>
       </li>
       <li>
  
  
  
  1.18      +10 -10    jakarta-tomcat-site/xdocs/stylesheets/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-site/xdocs/stylesheets/project.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- project.xml	29 Apr 2005 16:25:56 -0000	1.17
  +++ project.xml	16 May 2005 11:19:38 -0000	1.18
  @@ -6,7 +6,7 @@
       <logo href="./images/tomcat.gif">The Apache Tomcat Project</logo>
   
       <body>
  -    <menu name="Tomcat">
  +    <menu name="Apache Tomcat">
           <item name="Home"                 href="/index.html"/>
           <item name="Bug Database"         href="/bugreport.html"/>
           <item name="Resources"            href="/resources.html"/>
  @@ -15,22 +15,22 @@
       </menu>
   
       <menu name="Documentation">
  -        <item name="Tomcat 5.5"           href="/tomcat-5.5-doc/index.html"/>
  -        <item name="Tomcat 5.0"           href="/tomcat-5.0-doc/index.html"/>
  -        <item name="Tomcat 4.1"           href="/tomcat-4.1-doc/index.html"/>
  -        <item name="Tomcat 3.3"           href="/tomcat-3.3-doc/index.html"/>
  +        <item name="Apache Tomcat 5.5"           href="/tomcat-5.5-doc/index.html"/>
  +        <item name="Apache Tomcat 5.0"           href="/tomcat-5.0-doc/index.html"/>
  +        <item name="Apache Tomcat 4.1"           href="/tomcat-4.1-doc/index.html"/>
  +        <item name="Apache Tomcat 3.3"           href="/tomcat-3.3-doc/index.html"/>
       </menu>
   
       <menu name="Download">
           <item name="Current Releases"     href="/site/downloads/downloads_tomcat-5.cgi" />
  -        <item name="Tomcat 5.x"    href="http://archive.apache.org/dist/jakarta/tomcat-5/" />
  -        <item name="Tomcat 4.x"    href="http://archive.apache.org/dist/jakarta/tomcat-4/" />
  -        <item name="Tomcat 3.x"    href="http://archive.apache.org/dist/jakarta/tomcat-3/" />
  +        <item name="Apache Tomcat 5.x"    href="http://archive.apache.org/dist/jakarta/tomcat-5/" />
  +        <item name="Apache Tomcat 4.x"    href="http://archive.apache.org/dist/jakarta/tomcat-4/" />
  +        <item name="Apache Tomcat 3.x"    href="http://archive.apache.org/dist/jakarta/tomcat-3/" />
       </menu>
   
       <menu name="Archives">
  -        <item name="Tomcat 4.0"           href="/tomcat-4.0-doc/index.html"/>
  -        <item name="Tomcat 3.2"           href="/tomcat-3.2-doc/index.html"/>
  +        <item name="Apache Tomcat 4.0"           href="/tomcat-4.0-doc/index.html"/>
  +        <item name="Apache Tomcat 3.2"           href="/tomcat-3.2-doc/index.html"/>
       </menu>
   
       <menu name="Jakarta">
  
  
  

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