You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-cvs@jakarta.apache.org by cr...@locus.apache.org on 2000/12/13 01:02:13 UTC

cvs commit: jakarta-site2/xdocs/site binindex.xml news.xml sourceindex.xml

craigmcc    00/12/12 16:02:12

  Modified:    docs     index.html
               docs/site acknowledgements.html binindex.html bugs.html
                        communication.html contact.html cvsindex.html
                        cvsonunix.html cvsonwin32.html decisions.html
                        faqs.html getinvolved.html guidelines.html
                        jakarta-site2.html legal.html library.html
                        management.html mission.html news.html roles.html
                        source.html sourceindex.html whoweare.html
               xdocs    index.xml
               xdocs/site binindex.xml news.xml sourceindex.xml
  Log:
  Updates for Tomcat 3.1.1 and Tomcat 3.2.1 security-related
  maintenance releases.
  
  Revision  Changes    Path
  1.7       +25 -40    jakarta-site2/docs/index.html
  
  Index: index.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/index.html,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- index.html	2000/12/11 03:11:49	1.6
  +++ index.html	2000/12/13 00:02:05	1.7
  @@ -19,8 +19,7 @@
               <table border="0" width="100%" cellspacing="0">
                   <!-- TOP IMAGE -->
                   <tr>
  -                    
  -<td colspan="2">
  +                    <td colspan="2">
   <a href="http://jakarta.apache.org"><img src="http://jakarta.apache.org/images/jakarta-logo.gif" align="left" border="0"/></a>
   </td>
                   </tr>
  @@ -35,8 +34,7 @@
                       <td valign="top" nowrap="true">
                                   <strong>Essentials</strong>
           <ul>
  -                    <li>
  -    <a href="./index.html">Front Page</a>
  +                    <li>    <a href="./index.html">Front Page</a>
   </li>
                       <li>    <a href="http://jakarta.apache.org/site/news.html">News & Status</a>
   </li>
  @@ -69,35 +67,25 @@
                   </ul>
               <strong>SubProjects</strong>
           <ul>
  -                    <li>
  -    <a href="./ant/index.html">Ant</a>
  +                    <li>    <a href="./ant/index.html">Ant</a>
   </li>
  -                    <li>
  -    <a href="./ecs/index.html">ECS</a>
  +                    <li>    <a href="./ecs/index.html">ECS</a>
   </li>
  -                    <li>
  -    <a href="./oro/index.html">ORO</a>
  +                    <li>    <a href="./oro/index.html">ORO</a>
   </li>
  -                    <li>
  -    <a href="./regexp/index.html">Regexp</a>
  +                    <li>    <a href="./regexp/index.html">Regexp</a>
   </li>
  -                    <li>
  -    <a href="./slide/index.html">Slide</a>
  +                    <li>    <a href="./slide/index.html">Slide</a>
   </li>
  -                    <li>
  -    <a href="./struts/index.html">Struts</a>
  +                    <li>    <a href="./struts/index.html">Struts</a>
   </li>
  -                    <li>
  -    <a href="./taglibs/index.html">Taglibs</a>
  +                    <li>    <a href="./taglibs/index.html">Taglibs</a>
   </li>
  -                    <li>
  -    <a href="./tomcat/index.html">Tomcat</a>
  +                    <li>    <a href="./tomcat/index.html">Tomcat</a>
   </li>
  -                    <li>
  -    <a href="./velocity/index.html">Velocity</a>
  +                    <li>    <a href="./velocity/index.html">Velocity</a>
   </li>
  -                    <li>
  -    <a href="./watchdog/index.html">Watchdog</a>
  +                    <li>    <a href="./watchdog/index.html">Watchdog</a>
   </li>
                   </ul>
               <strong>Misc</strong>
  @@ -123,14 +111,12 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
   The goal of the Jakarta Project is to provide commercial-quality
   server solutions based on the Java Platform that are developed in an
   open and cooperative fashion.
   </p>
  -                                
  -                <p>
  +                                                <p>
   Jakarta is the "overall" project for many subprojects. For example, Tomcat is
   the Servlet Engine which is a subproject of the Jakarta Project. Many people
   confuse Jakarta and Tomcat together even though the reality is that Jakarta is
  @@ -138,26 +124,22 @@
   get information about each of the projects by looking at the left side
   navigation under the "SubProjects" headings.
   </p>
  -                                
  -                <p>
  +                                                <p>
   The older <a href="http://java.apache.org/">Java Apache</a> Project will have
   its projects merged into the Jakarta Project in the near future (no set
   date). For more information please see the announcement on that website.
   </p>
  -                                
  -                <p>
  +                                                <p>
   If you need support for any of the projects or you are trying to get more
   information on any of the projects, we suggest that you join one of the
   <strong>User</strong> <a href="./site/mail.html">mailing lists</a>.
   </p>
  -                                
  -                <p>
  +                                                <p>
   For information on how to contribute to the projects, please see the <a href="./site/guidelines.html">Guidelines</a> section of our website. This
   section contains details on how we accept patch submissions, voting
   procedures, communication and many other important aspects of how <a href="./site/whoweare.html">we</a> manage this project.
   </p>
  -                                
  -                <table border="0">
  +                                                <table border="0">
   <tr>
       <td>
           <a href="/tomcat/index.html"><img src="images/logos/tomcat_3.gif" width="100" height="71" align="left" border="0" hspace="10" /></a>
  @@ -171,6 +153,11 @@
               Java Servlet 2.2 and JavaServer Pages 1.1 Specifications. This
               implementation will be used in the Apache Web Server as well as in
               other web servers and development tools.
  +            <strong><font color="red">NOW AVAILABLE:</font>
  +            Security-fix updates for
  +            <a href="/builds/tomcat/release/v3.1.1/bin/">Tomcat 3.1.1</a> and
  +            <a href="/builds/tomcat/release/v3.2.1/bin/">Tomcat 3.2.1</a>
  +            </strong>
           </p>
       </td>
   </tr>
  @@ -210,10 +197,8 @@
   </tr>
   -->
   </table>
  -                                
  -                <h3>Anyone Can Participate</h3>
  -                                
  -                <p>
  +                                                <h3>Anyone Can Participate</h3>
  +                                                <p>
   The Jakarta Project is composed of members of the Apache Jserv
   Project, engineers from major corporations such as Sun and IBM, newer
   companies like Intalio, and  serious, committed individual
  
  
  
  1.6       +20 -40    jakarta-site2/docs/site/acknowledgements.html
  
  Index: acknowledgements.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/acknowledgements.html,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- acknowledgements.html	2000/12/11 03:11:49	1.5
  +++ acknowledgements.html	2000/12/13 00:02:05	1.6
  @@ -19,8 +19,7 @@
               <table border="0" width="100%" cellspacing="0">
                   <!-- TOP IMAGE -->
                   <tr>
  -                    
  -<td colspan="2">
  +                    <td colspan="2">
   <a href="http://jakarta.apache.org"><img src="http://jakarta.apache.org/images/jakarta-logo.gif" align="left" border="0"/></a>
   </td>
                   </tr>
  @@ -35,8 +34,7 @@
                       <td valign="top" nowrap="true">
                                   <strong>Essentials</strong>
           <ul>
  -                    <li>
  -    <a href="../index.html">Front Page</a>
  +                    <li>    <a href="../index.html">Front Page</a>
   </li>
                       <li>    <a href="http://jakarta.apache.org/site/news.html">News & Status</a>
   </li>
  @@ -69,35 +67,25 @@
                   </ul>
               <strong>SubProjects</strong>
           <ul>
  -                    <li>
  -    <a href="../ant/index.html">Ant</a>
  +                    <li>    <a href="../ant/index.html">Ant</a>
   </li>
  -                    <li>
  -    <a href="../ecs/index.html">ECS</a>
  +                    <li>    <a href="../ecs/index.html">ECS</a>
   </li>
  -                    <li>
  -    <a href="../oro/index.html">ORO</a>
  +                    <li>    <a href="../oro/index.html">ORO</a>
   </li>
  -                    <li>
  -    <a href="../regexp/index.html">Regexp</a>
  +                    <li>    <a href="../regexp/index.html">Regexp</a>
   </li>
  -                    <li>
  -    <a href="../slide/index.html">Slide</a>
  +                    <li>    <a href="../slide/index.html">Slide</a>
   </li>
  -                    <li>
  -    <a href="../struts/index.html">Struts</a>
  +                    <li>    <a href="../struts/index.html">Struts</a>
   </li>
  -                    <li>
  -    <a href="../taglibs/index.html">Taglibs</a>
  +                    <li>    <a href="../taglibs/index.html">Taglibs</a>
   </li>
  -                    <li>
  -    <a href="../tomcat/index.html">Tomcat</a>
  +                    <li>    <a href="../tomcat/index.html">Tomcat</a>
   </li>
  -                    <li>
  -    <a href="../velocity/index.html">Velocity</a>
  +                    <li>    <a href="../velocity/index.html">Velocity</a>
   </li>
  -                    <li>
  -    <a href="../watchdog/index.html">Watchdog</a>
  +                    <li>    <a href="../watchdog/index.html">Watchdog</a>
   </li>
                   </ul>
               <strong>Misc</strong>
  @@ -123,46 +111,38 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
   A collaborative project like this doesn't exist in a vacuum. In order to keep project like this running,
   you need support and help. Project Jakarta has been fortunate to have the support of the following:
   </p>
  -                                
  -                <p>
  +                                                <p>
   <a href="http://www.apache.org/"><b>The Apache Group</b></a><br />
   Project Jakarta operates as a project under the Apache umbrella. It abides by the same principles and
   operating procedures as the parent organization.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <a href="http://www.sun.com/"><b>Sun Microsystems, Inc.</b></a><br />
   Sun is in the process of releasing the code for the JSDK and JSP reference implementations to the
   Project and provides many engineers to support this project.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <a href="http://www.ibm.com/"><b>IBM</b></a><br />
   IBM is one of the first corporations to pledge support and engineering resources to The Jakarta
   Project.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <a href="http://www.collab.net/"><b>CollabNet</b></a><br />
   CollabNet has donated freely of their time and resources to help the Project.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <a href="http://www.clearink.com/"><b>Clear Ink</b></a><br />
   Clear Ink has donated freely of their time and resources to help the Project.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <a href="http://www.hyperreal.org/"><b>Hyperreal</b></a><br />
   Hyperreal is the server that this site is served from.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <a href="http://www.above.net/"><b>Above.Net</b></a><br />
   Above.Net provides the network bandwidth for the Apache websites.
   </p>
  
  
  
  1.8       +27 -51    jakarta-site2/docs/site/binindex.html
  
  Index: binindex.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/binindex.html,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- binindex.html	2000/12/11 03:15:22	1.7
  +++ binindex.html	2000/12/13 00:02:06	1.8
  @@ -19,8 +19,7 @@
               <table border="0" width="100%" cellspacing="0">
                   <!-- TOP IMAGE -->
                   <tr>
  -                    
  -<td colspan="2">
  +                    <td colspan="2">
   <a href="http://jakarta.apache.org"><img src="http://jakarta.apache.org/images/jakarta-logo.gif" align="left" border="0"/></a>
   </td>
                   </tr>
  @@ -35,8 +34,7 @@
                       <td valign="top" nowrap="true">
                                   <strong>Essentials</strong>
           <ul>
  -                    <li>
  -    <a href="../index.html">Front Page</a>
  +                    <li>    <a href="../index.html">Front Page</a>
   </li>
                       <li>    <a href="http://jakarta.apache.org/site/news.html">News & Status</a>
   </li>
  @@ -69,35 +67,25 @@
                   </ul>
               <strong>SubProjects</strong>
           <ul>
  -                    <li>
  -    <a href="../ant/index.html">Ant</a>
  +                    <li>    <a href="../ant/index.html">Ant</a>
   </li>
  -                    <li>
  -    <a href="../ecs/index.html">ECS</a>
  +                    <li>    <a href="../ecs/index.html">ECS</a>
   </li>
  -                    <li>
  -    <a href="../oro/index.html">ORO</a>
  +                    <li>    <a href="../oro/index.html">ORO</a>
   </li>
  -                    <li>
  -    <a href="../regexp/index.html">Regexp</a>
  +                    <li>    <a href="../regexp/index.html">Regexp</a>
   </li>
  -                    <li>
  -    <a href="../slide/index.html">Slide</a>
  +                    <li>    <a href="../slide/index.html">Slide</a>
   </li>
  -                    <li>
  -    <a href="../struts/index.html">Struts</a>
  +                    <li>    <a href="../struts/index.html">Struts</a>
   </li>
  -                    <li>
  -    <a href="../taglibs/index.html">Taglibs</a>
  +                    <li>    <a href="../taglibs/index.html">Taglibs</a>
   </li>
  -                    <li>
  -    <a href="../tomcat/index.html">Tomcat</a>
  +                    <li>    <a href="../tomcat/index.html">Tomcat</a>
   </li>
  -                    <li>
  -    <a href="../velocity/index.html">Velocity</a>
  +                    <li>    <a href="../velocity/index.html">Velocity</a>
   </li>
  -                    <li>
  -    <a href="../watchdog/index.html">Watchdog</a>
  +                    <li>    <a href="../watchdog/index.html">Watchdog</a>
   </li>
                   </ul>
               <strong>Misc</strong>
  @@ -123,34 +111,29 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
   We make binary versions of our code for the convienence of our
   users. In general, binaries are meant for developers who want to use
   the Servlet and JavaServer Pages technologies (versus those who want to 
   "hack" the technologies in order to integrate them into other products). 
   </p>
  -                                
  -                <p>
  +                                                <p>
   Depending on what kind of user you are, you'll want to use a
   particular type of build. We divide our available binaries into the
   following categories:
   </p>
  -                                
  -                <ul>
  +                                                <ul>
   <li>Release Builds</li>
   <li>Milestone Builds</li>
   <li>Nightly Builds</li>
   </ul>
  -                                
  -                <p>
  +                                                <p>
   <b>Release Builds</b> are those that are ready for Prime Time. These
   releases have been reviewed to ensure compatability with the Servlets
   and JavaServer Pages Specification. This build is "as good as it
   gets!"
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b>Milestone Builds</b> are those that are somewhat stable but not
   crystal-clean.  We have some confidence in them, but they are buggy
   and should only be used by advanced users who want to explore future
  @@ -158,44 +141,37 @@
   developers, these builds serve as a mechanism to track progress
   towards a release.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b>Nightly Builds</b> are those that are very unstable
   (a.k.a. dynamite!). We have no confidence in them. They are for
   developers who are helping to develop the technology and want "the
   latest bits." Use at your own risk!
   </p>
  -                                
  -                <p>
  +                                                <p>
   To get the actual source code, <a href="./sourceindex.html">click here</a>.
   </p>
  -                                
  -                <h2>
  +                                                <h2>
   Release Builds
   </h2>
  -                                
  -                <ul>
  +                                                <ul>
   <li><a href="/builds/jakarta-ant/release/v1.2/bin/">Ant 1.2</a></li>
   <li><a href="/builds/jakarta-ecs/release/v1.3.3/">ECS 1.3.3</a></li>
   <li><a href="/builds/jakarta-oro/release/v2.0.1/">ORO 2.0.1</a></li>
   <li><a href="/builds/jakarta-regexp/release/v1.2/">Regexp 1.2</a></li>
  -<li><a href="/builds/jakarta-tomcat/release/v3.2/bin/">Tomcat 3.2</a></li>
  +<li><a href="/builds/jakarta-tomcat/release/v3.1.1/bin/">Tomcat 3.1.1</a></li>
  +<li><a href="/builds/jakarta-tomcat/release/v3.2.1/bin/">Tomcat 3.2.1</a></li>
   </ul>
  -                                
  -                <h2>
  +                                                <h2>
   Milestone Builds
   </h2>
  -                                
  -                <ul>
  +                                                <ul>
   <li><a href="/builds/jakarta-tomcat-4.0/release/v4.0-m4/">Tomcat 4.0 milestone 
   4</a></li>
   </ul>
  -                                
  -                <h2>
  +                                                <h2>
   Nightly Builds
   </h2>
  -                                
  -                <ul>
  +                                                <ul>
   <li><a href="/builds/jakarta-ant/nightly/">Ant</a></li>
   <li><a href="/builds/jakarta-servletapi-4.0/nightly/">Servlet 2.3 and JSP 1.2 
   Classes (required for Tomcat 4.0-dev)</a></li>
  
  
  
  1.8       +23 -43    jakarta-site2/docs/site/bugs.html
  
  Index: bugs.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/bugs.html,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- bugs.html	2000/12/11 03:11:49	1.7
  +++ bugs.html	2000/12/13 00:02:06	1.8
  @@ -19,8 +19,7 @@
               <table border="0" width="100%" cellspacing="0">
                   <!-- TOP IMAGE -->
                   <tr>
  -                    
  -<td colspan="2">
  +                    <td colspan="2">
   <a href="http://jakarta.apache.org"><img src="http://jakarta.apache.org/images/jakarta-logo.gif" align="left" border="0"/></a>
   </td>
                   </tr>
  @@ -35,8 +34,7 @@
                       <td valign="top" nowrap="true">
                                   <strong>Essentials</strong>
           <ul>
  -                    <li>
  -    <a href="../index.html">Front Page</a>
  +                    <li>    <a href="../index.html">Front Page</a>
   </li>
                       <li>    <a href="http://jakarta.apache.org/site/news.html">News & Status</a>
   </li>
  @@ -69,35 +67,25 @@
                   </ul>
               <strong>SubProjects</strong>
           <ul>
  -                    <li>
  -    <a href="../ant/index.html">Ant</a>
  +                    <li>    <a href="../ant/index.html">Ant</a>
   </li>
  -                    <li>
  -    <a href="../ecs/index.html">ECS</a>
  +                    <li>    <a href="../ecs/index.html">ECS</a>
   </li>
  -                    <li>
  -    <a href="../oro/index.html">ORO</a>
  +                    <li>    <a href="../oro/index.html">ORO</a>
   </li>
  -                    <li>
  -    <a href="../regexp/index.html">Regexp</a>
  +                    <li>    <a href="../regexp/index.html">Regexp</a>
   </li>
  -                    <li>
  -    <a href="../slide/index.html">Slide</a>
  +                    <li>    <a href="../slide/index.html">Slide</a>
   </li>
  -                    <li>
  -    <a href="../struts/index.html">Struts</a>
  +                    <li>    <a href="../struts/index.html">Struts</a>
   </li>
  -                    <li>
  -    <a href="../taglibs/index.html">Taglibs</a>
  +                    <li>    <a href="../taglibs/index.html">Taglibs</a>
   </li>
  -                    <li>
  -    <a href="../tomcat/index.html">Tomcat</a>
  +                    <li>    <a href="../tomcat/index.html">Tomcat</a>
   </li>
  -                    <li>
  -    <a href="../velocity/index.html">Velocity</a>
  +                    <li>    <a href="../velocity/index.html">Velocity</a>
   </li>
  -                    <li>
  -    <a href="../watchdog/index.html">Watchdog</a>
  +                    <li>    <a href="../watchdog/index.html">Watchdog</a>
   </li>
                   </ul>
               <strong>Misc</strong>
  @@ -123,30 +111,26 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
   The old bug tracking system (Bugzilla) was found to have security
   problems. It has been disabled.
   </p>
  -                                
  -                <p>
  +                                                <p>
   Nick Bauman has set up a new bug tracking system using the BugRat
   servlet by Tim Endres.  While plans are still underway to use <a href="http://scarab.tigris.org/">Scarab</a> once it's ready, this is a
   great solution for the time being.  This system is not administered
   by Apache in any way; please report any problems with the bug system
  -<a href="mailto:nixnixnix@yahoo.com">directly to Nick</a>.  
  +<a href="mailto:nick@cortexity.com">directly to Nick</a>.  
   </p>
  -                                
  -                <ul>
  +                                                <ul>
   <li><a href="http://znutar.cortexity.com/">Interim Bug Tracking System</a>
   </li>
  -<li><a href="http://znutar.cortexity.com/BugRatReport">Submit a Bug or Feature Request</a>
  +<li><a href="http://znutar.cortexity.com/BugRatReport/">Submit a Bug or Feature Request</a>
   </li>
  -<li><a href="http://znutar.cortexity.com/BugRatViewer">View Bugs</a>
  +<li><a href="http://znutar.cortexity.com/BugRatViewer/">View Bugs</a>
   </li>
   </ul>
  -                                
  -                <p>
  +                                                <p>
   If you have a bug to report, you should submit it to BugRat.  You should also 
   post the bug to the appropriate <a href="./mail.html">developer mailing list</a> 
   just in case.  Use the prefix "[BUG]" on your message subject.  Be sure to 
  @@ -154,19 +138,15 @@
   version numbers, error logs, configuration, etc.  Please also include the BugRat 
   ID in your post.
   </p>
  -                                
  -                <p>
  +                                                <p>
   If you have a patch to submit, please mail it to the appropriate <a href="./mail.html">developer
   mailing list</a>.  Use the prefix "[PATCH]" on your message subject.
   Please include any relevant BugRat IDs.  Diffs should be created with
   the "-u" option, for instance 
   </p>
  -                                
  -                <pre><big>cvs diff -u Main.java &gt;&gt; patchfile.txt</big></pre>
  -                                
  -                <pre><big>diff -u Main.java.orig Main.java &gt;&gt; patchfile.txt</big></pre>
  -                                
  -                <p>
  +                                                <pre><big>cvs diff -u Main.java &gt;&gt; patchfile.txt</big></pre>
  +                                                <pre><big>diff -u Main.java.orig Main.java &gt;&gt; patchfile.txt</big></pre>
  +                                                <p>
   See the <a href="./source.html">guidelines</a> section of our site for more 
   details. 
   </p>
  
  
  
  1.6       +20 -40    jakarta-site2/docs/site/communication.html
  
  Index: communication.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/communication.html,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- communication.html	2000/12/11 03:11:49	1.5
  +++ communication.html	2000/12/13 00:02:06	1.6
  @@ -19,8 +19,7 @@
               <table border="0" width="100%" cellspacing="0">
                   <!-- TOP IMAGE -->
                   <tr>
  -                    
  -<td colspan="2">
  +                    <td colspan="2">
   <a href="http://jakarta.apache.org"><img src="http://jakarta.apache.org/images/jakarta-logo.gif" align="left" border="0"/></a>
   </td>
                   </tr>
  @@ -35,8 +34,7 @@
                       <td valign="top" nowrap="true">
                                   <strong>Essentials</strong>
           <ul>
  -                    <li>
  -    <a href="../index.html">Front Page</a>
  +                    <li>    <a href="../index.html">Front Page</a>
   </li>
                       <li>    <a href="http://jakarta.apache.org/site/news.html">News & Status</a>
   </li>
  @@ -69,35 +67,25 @@
                   </ul>
               <strong>SubProjects</strong>
           <ul>
  -                    <li>
  -    <a href="../ant/index.html">Ant</a>
  +                    <li>    <a href="../ant/index.html">Ant</a>
   </li>
  -                    <li>
  -    <a href="../ecs/index.html">ECS</a>
  +                    <li>    <a href="../ecs/index.html">ECS</a>
   </li>
  -                    <li>
  -    <a href="../oro/index.html">ORO</a>
  +                    <li>    <a href="../oro/index.html">ORO</a>
   </li>
  -                    <li>
  -    <a href="../regexp/index.html">Regexp</a>
  +                    <li>    <a href="../regexp/index.html">Regexp</a>
   </li>
  -                    <li>
  -    <a href="../slide/index.html">Slide</a>
  +                    <li>    <a href="../slide/index.html">Slide</a>
   </li>
  -                    <li>
  -    <a href="../struts/index.html">Struts</a>
  +                    <li>    <a href="../struts/index.html">Struts</a>
   </li>
  -                    <li>
  -    <a href="../taglibs/index.html">Taglibs</a>
  +                    <li>    <a href="../taglibs/index.html">Taglibs</a>
   </li>
  -                    <li>
  -    <a href="../tomcat/index.html">Tomcat</a>
  +                    <li>    <a href="../tomcat/index.html">Tomcat</a>
   </li>
  -                    <li>
  -    <a href="../velocity/index.html">Velocity</a>
  +                    <li>    <a href="../velocity/index.html">Velocity</a>
   </li>
  -                    <li>
  -    <a href="../watchdog/index.html">Watchdog</a>
  +                    <li>    <a href="../watchdog/index.html">Watchdog</a>
   </li>
                   </ul>
               <strong>Misc</strong>
  @@ -123,8 +111,7 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
     The Project obtains its strength from the communication of its
     members. In order for members to easily communicate with each other,
     the Project has a variety of mailing lists. These lists, with the
  @@ -132,20 +119,17 @@
     is more than welcome to join them. However, you must be subscribed
     to post to a list.
     </p>
  -                                
  -                <p>
  +                                                <p>
     To reduce the bandwidth demands on everyone, mail should not contain
     attachments. It is recommended that you place interesting material
     (such as patches) either within the body of the message or
     provide a URL for retrieval.
     </p>
  -                                
  -                <p>
  +                                                <p>
     To join the mailing lists, see our <a href="./mail.html">
     Mailing List</a> page.
     </p>
  -                                
  -                <p>
  +                                                <p>
     The Project's list fall into the following categories:
     </p>
                               </blockquote>
  @@ -159,8 +143,7 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
     Announcement lists are very low traffic designed to communicate
     important information, such as final releases of a subproject's 
     code, to a wide audience.
  @@ -176,8 +159,7 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
     User lists are for users of a product to converse about such things
     as configuration and operating of the products of the Project. 
     </p>
  @@ -192,8 +174,7 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
     Developer lists are for the developers of the project. On these
     lists suggestions and comments for code changes are discussed and
     action items are raised and voted on. For the developer community,
  @@ -211,8 +192,7 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
     The commit lists are where all cvs code commit messages are
     sent. All committers are required to subscribe to this list so that
     they can stay aware of changes to the repository.
  
  
  
  1.5       +17 -34    jakarta-site2/docs/site/contact.html
  
  Index: contact.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/contact.html,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- contact.html	2000/12/11 03:11:49	1.4
  +++ contact.html	2000/12/13 00:02:06	1.5
  @@ -19,8 +19,7 @@
               <table border="0" width="100%" cellspacing="0">
                   <!-- TOP IMAGE -->
                   <tr>
  -                    
  -<td colspan="2">
  +                    <td colspan="2">
   <a href="http://jakarta.apache.org"><img src="http://jakarta.apache.org/images/jakarta-logo.gif" align="left" border="0"/></a>
   </td>
                   </tr>
  @@ -35,8 +34,7 @@
                       <td valign="top" nowrap="true">
                                   <strong>Essentials</strong>
           <ul>
  -                    <li>
  -    <a href="../index.html">Front Page</a>
  +                    <li>    <a href="../index.html">Front Page</a>
   </li>
                       <li>    <a href="http://jakarta.apache.org/site/news.html">News & Status</a>
   </li>
  @@ -69,35 +67,25 @@
                   </ul>
               <strong>SubProjects</strong>
           <ul>
  -                    <li>
  -    <a href="../ant/index.html">Ant</a>
  +                    <li>    <a href="../ant/index.html">Ant</a>
   </li>
  -                    <li>
  -    <a href="../ecs/index.html">ECS</a>
  +                    <li>    <a href="../ecs/index.html">ECS</a>
   </li>
  -                    <li>
  -    <a href="../oro/index.html">ORO</a>
  +                    <li>    <a href="../oro/index.html">ORO</a>
   </li>
  -                    <li>
  -    <a href="../regexp/index.html">Regexp</a>
  +                    <li>    <a href="../regexp/index.html">Regexp</a>
   </li>
  -                    <li>
  -    <a href="../slide/index.html">Slide</a>
  +                    <li>    <a href="../slide/index.html">Slide</a>
   </li>
  -                    <li>
  -    <a href="../struts/index.html">Struts</a>
  +                    <li>    <a href="../struts/index.html">Struts</a>
   </li>
  -                    <li>
  -    <a href="../taglibs/index.html">Taglibs</a>
  +                    <li>    <a href="../taglibs/index.html">Taglibs</a>
   </li>
  -                    <li>
  -    <a href="../tomcat/index.html">Tomcat</a>
  +                    <li>    <a href="../tomcat/index.html">Tomcat</a>
   </li>
  -                    <li>
  -    <a href="../velocity/index.html">Velocity</a>
  +                    <li>    <a href="../velocity/index.html">Velocity</a>
   </li>
  -                    <li>
  -    <a href="../watchdog/index.html">Watchdog</a>
  +                    <li>    <a href="../watchdog/index.html">Watchdog</a>
   </li>
                   </ul>
               <strong>Misc</strong>
  @@ -123,27 +111,22 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
   If you have questions or comments about this site, please send email
   to:
   </p>
  -                                
  -                <p> 
  +                                                <p> 
   <a href="mailto:webmaster@jakarta.apache.org">
   webmaster@jakarta.apache.org</a>
   </p>
  -                                
  -                <p>
  +                                                <p>
   The Jakarta Project is an effort of the Apache Software Foundation. The 
   address for general ASF correspondence and licensing questions is:
   </p>
  -                                
  -                <p>
  +                                                <p>
   <a href="mailto:apache@apache.org">apache@apache.org</a>
   </p>
  -                                
  -                <p>
  +                                                <p>
   You can find more contact information for the Apache Software Foundation 
   on the <a href="http://www.apache.org/foundation/contact.html">contact 
   page of the main Apache site</a>.
  
  
  
  1.7       +22 -44    jakarta-site2/docs/site/cvsindex.html
  
  Index: cvsindex.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/cvsindex.html,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- cvsindex.html	2000/12/11 03:11:49	1.6
  +++ cvsindex.html	2000/12/13 00:02:06	1.7
  @@ -19,8 +19,7 @@
               <table border="0" width="100%" cellspacing="0">
                   <!-- TOP IMAGE -->
                   <tr>
  -                    
  -<td colspan="2">
  +                    <td colspan="2">
   <a href="http://jakarta.apache.org"><img src="http://jakarta.apache.org/images/jakarta-logo.gif" align="left" border="0"/></a>
   </td>
                   </tr>
  @@ -35,8 +34,7 @@
                       <td valign="top" nowrap="true">
                                   <strong>Essentials</strong>
           <ul>
  -                    <li>
  -    <a href="../index.html">Front Page</a>
  +                    <li>    <a href="../index.html">Front Page</a>
   </li>
                       <li>    <a href="http://jakarta.apache.org/site/news.html">News & Status</a>
   </li>
  @@ -69,35 +67,25 @@
                   </ul>
               <strong>SubProjects</strong>
           <ul>
  -                    <li>
  -    <a href="../ant/index.html">Ant</a>
  +                    <li>    <a href="../ant/index.html">Ant</a>
   </li>
  -                    <li>
  -    <a href="../ecs/index.html">ECS</a>
  +                    <li>    <a href="../ecs/index.html">ECS</a>
   </li>
  -                    <li>
  -    <a href="../oro/index.html">ORO</a>
  +                    <li>    <a href="../oro/index.html">ORO</a>
   </li>
  -                    <li>
  -    <a href="../regexp/index.html">Regexp</a>
  +                    <li>    <a href="../regexp/index.html">Regexp</a>
   </li>
  -                    <li>
  -    <a href="../slide/index.html">Slide</a>
  +                    <li>    <a href="../slide/index.html">Slide</a>
   </li>
  -                    <li>
  -    <a href="../struts/index.html">Struts</a>
  +                    <li>    <a href="../struts/index.html">Struts</a>
   </li>
  -                    <li>
  -    <a href="../taglibs/index.html">Taglibs</a>
  +                    <li>    <a href="../taglibs/index.html">Taglibs</a>
   </li>
  -                    <li>
  -    <a href="../tomcat/index.html">Tomcat</a>
  +                    <li>    <a href="../tomcat/index.html">Tomcat</a>
   </li>
  -                    <li>
  -    <a href="../velocity/index.html">Velocity</a>
  +                    <li>    <a href="../velocity/index.html">Velocity</a>
   </li>
  -                    <li>
  -    <a href="../watchdog/index.html">Watchdog</a>
  +                    <li>    <a href="../watchdog/index.html">Watchdog</a>
   </li>
                   </ul>
               <strong>Misc</strong>
  @@ -123,8 +111,7 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
   Most users of the source code probably don't need to have day to day
   access to the source code as it changes. For these users we provide
   easy to unpack source code downloads via our <a href="./sourceindex.html">download pages</a>. For projects not
  @@ -142,16 +129,14 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
   So, you've decided that you need access to the source tree to see the
   latest and greatest code. There's two different forms of CVS
   access. The first is <em>anonymous</em> and anybody can use it. The
   second is not and you must have a login to the development server. If
   you don't know what this means, join the mailing list and find out.
   </p>
  -                                
  -                <p>
  +                                                <p>
   Anyone can checkout source code from our anonymous CVS server. To do
   so, simply use the following commands (if you are using a GUI CVS
   client, configure it appropriatly):
  @@ -199,12 +184,10 @@
       </tr>
       </table>
       </div>
  -                                
  -                <p>
  +                                                <p>
   Modules available for access are (click the links to view the CVS tree via CVSWeb):
   </p>
  -                                
  -                <ul>
  +                                                <ul>
   <li><a href="http://jakarta.apache.org/cvsweb/index.cgi/jakarta-ant">
   jakarta-ant</a></li>
   <li><a href="http://jakarta.apache.org/cvsweb/index.cgi/jakarta-ecs">
  @@ -239,8 +222,7 @@
   <li><a href="http://jakarta.apache.org/cvsweb/index.cgi/jakarta-watchdog-4.0">
   jakarta-watchdog-4.0</a></li>
   </ul>
  -                                
  -                <p>
  +                                                <p>
   You'll always want to have a copy of the jakarta-ant and
   jakarta-servletapi workspaces as this contains the libraries and tools used to
   build tomcat itself. For example, to get and build Tomcat, use the following
  @@ -278,20 +260,17 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
   If you are a <em>Committer</em> and have a login on the Apache
   development server, this section is for you. If you are not a Committer, but
   you want to submit patches or even request commit privelages, please see our
   <a href="./guidelines.html">Guidelines</a> for more information.
   </p>
  -                                
  -                <p>
  +                                                <p>
   To have full access to the CVS server, you need to follow the links 
   depending on the operating system you are using:
   </p>
  -                                
  -                <ul>
  +                                                <ul>
   <li><a href="./cvsonunix.html">Unix</a></li>
   <li><a href="./cvsonwin32.html">Windows</a></li>
   </ul>
  @@ -306,8 +285,7 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
   For some, using CVS pserver might not be enough. You can access the
   Jakarta source modules via CVSup or Rsync. For more information about
   how to use these tools with the Apache CVS tree, see the <a href="http://www.apache.org/info/how-to-mirror.html">Apache Mirroring
  
  
  
  1.6       +23 -46    jakarta-site2/docs/site/cvsonunix.html
  
  Index: cvsonunix.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/cvsonunix.html,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- cvsonunix.html	2000/12/11 03:11:49	1.5
  +++ cvsonunix.html	2000/12/13 00:02:06	1.6
  @@ -19,8 +19,7 @@
               <table border="0" width="100%" cellspacing="0">
                   <!-- TOP IMAGE -->
                   <tr>
  -                    
  -<td colspan="2">
  +                    <td colspan="2">
   <a href="http://jakarta.apache.org"><img src="http://jakarta.apache.org/images/jakarta-logo.gif" align="left" border="0"/></a>
   </td>
                   </tr>
  @@ -35,8 +34,7 @@
                       <td valign="top" nowrap="true">
                                   <strong>Essentials</strong>
           <ul>
  -                    <li>
  -    <a href="../index.html">Front Page</a>
  +                    <li>    <a href="../index.html">Front Page</a>
   </li>
                       <li>    <a href="http://jakarta.apache.org/site/news.html">News & Status</a>
   </li>
  @@ -69,35 +67,25 @@
                   </ul>
               <strong>SubProjects</strong>
           <ul>
  -                    <li>
  -    <a href="../ant/index.html">Ant</a>
  +                    <li>    <a href="../ant/index.html">Ant</a>
   </li>
  -                    <li>
  -    <a href="../ecs/index.html">ECS</a>
  +                    <li>    <a href="../ecs/index.html">ECS</a>
   </li>
  -                    <li>
  -    <a href="../oro/index.html">ORO</a>
  +                    <li>    <a href="../oro/index.html">ORO</a>
   </li>
  -                    <li>
  -    <a href="../regexp/index.html">Regexp</a>
  +                    <li>    <a href="../regexp/index.html">Regexp</a>
   </li>
  -                    <li>
  -    <a href="../slide/index.html">Slide</a>
  +                    <li>    <a href="../slide/index.html">Slide</a>
   </li>
  -                    <li>
  -    <a href="../struts/index.html">Struts</a>
  +                    <li>    <a href="../struts/index.html">Struts</a>
   </li>
  -                    <li>
  -    <a href="../taglibs/index.html">Taglibs</a>
  +                    <li>    <a href="../taglibs/index.html">Taglibs</a>
   </li>
  -                    <li>
  -    <a href="../tomcat/index.html">Tomcat</a>
  +                    <li>    <a href="../tomcat/index.html">Tomcat</a>
   </li>
  -                    <li>
  -    <a href="../velocity/index.html">Velocity</a>
  +                    <li>    <a href="../velocity/index.html">Velocity</a>
   </li>
  -                    <li>
  -    <a href="../watchdog/index.html">Watchdog</a>
  +                    <li>    <a href="../watchdog/index.html">Watchdog</a>
   </li>
                   </ul>
               <strong>Misc</strong>
  @@ -123,17 +111,14 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
   On Unix, you need the following software products:
   </p>
  -                                
  -                <ul>
  +                                                <ul>
   <li><a href="http://download.cyclic.com/pub/">CVS client (pick up latest version)</a></li>
   <li><a href="ftp://ftp.cs.hut.fi/pub/ssh/">SSH client (pick up 1.x, not 2.x)</a></li>
   </ul>
  -                                
  -                <p>
  +                                                <p>
   Depending on your platform you may be able to pick up precompiled
   versions or have to compile them yourself.
   </p>
  @@ -148,20 +133,17 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
   Since both CVS and SSH are based on open standards, there are lots of CVS and 
   SSH tools freely available on the net, both of command line and GUI behavior. 
   This means that any compliant implementations of those standards should work 
   as well.
   </p>
  -                                
  -                <p>
  +                                                <p>
   For some more software options as well as other tips and tricks, see
   <a href="http://www.hyperreal.org/info/ssh/">www.hyperreal.org/info/ssh/</a>
   </p>
  -                                
  -                <p>
  +                                                <p>
   In addition, if you are behind a corporate firewall, your best option
   is to use a socks proxy. Most SSH software knows how to traverse socks
   proxies. In addition, there are socks utility programs that
  @@ -179,8 +161,7 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
   The first step is to set up the SSH tunnel to jakarta. To do this, you
   need to have your SSH client software redirect your local port 2401 to
   the far side of the SSH connection. The command looks something like this:
  @@ -206,8 +187,7 @@
       </tr>
       </table>
       </div>
  -                                
  -                <p>
  +                                                <p>
   The next step is to use the CVS pserver functionality to
   login. You'll want to do this in a seperate terminal from the one that
   you logged into jakarta with so that you check out the files to your local
  @@ -234,14 +214,12 @@
       </tr>
       </table>
       </div>
  -                                
  -                <p>
  +                                                <p>
   Note that the CVS client thinks it is talking to a server
   running on your local machine, but in fact is talking to the CVS
   pserver on jakarta thanks to the SSH tunnel.
   </p>
  -                                
  -                <p>
  +                                                <p>
   After you login, you can check out any of the source trees. The
   command to checkout the Tomcat source is:
   </p>
  @@ -266,8 +244,7 @@
       </tr>
       </table>
       </div>
  -                                
  -                <p>
  +                                                <p>
   Once you checkout a source tree, all CVS operations in that source tree do not 
   require the <code>-d :pserver:</code> argument.
   </p>
  
  
  
  1.6       +30 -60    jakarta-site2/docs/site/cvsonwin32.html
  
  Index: cvsonwin32.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/cvsonwin32.html,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- cvsonwin32.html	2000/12/11 03:11:49	1.5
  +++ cvsonwin32.html	2000/12/13 00:02:06	1.6
  @@ -19,8 +19,7 @@
               <table border="0" width="100%" cellspacing="0">
                   <!-- TOP IMAGE -->
                   <tr>
  -                    
  -<td colspan="2">
  +                    <td colspan="2">
   <a href="http://jakarta.apache.org"><img src="http://jakarta.apache.org/images/jakarta-logo.gif" align="left" border="0"/></a>
   </td>
                   </tr>
  @@ -35,8 +34,7 @@
                       <td valign="top" nowrap="true">
                                   <strong>Essentials</strong>
           <ul>
  -                    <li>
  -    <a href="../index.html">Front Page</a>
  +                    <li>    <a href="../index.html">Front Page</a>
   </li>
                       <li>    <a href="http://jakarta.apache.org/site/news.html">News & Status</a>
   </li>
  @@ -69,35 +67,25 @@
                   </ul>
               <strong>SubProjects</strong>
           <ul>
  -                    <li>
  -    <a href="../ant/index.html">Ant</a>
  +                    <li>    <a href="../ant/index.html">Ant</a>
   </li>
  -                    <li>
  -    <a href="../ecs/index.html">ECS</a>
  +                    <li>    <a href="../ecs/index.html">ECS</a>
   </li>
  -                    <li>
  -    <a href="../oro/index.html">ORO</a>
  +                    <li>    <a href="../oro/index.html">ORO</a>
   </li>
  -                    <li>
  -    <a href="../regexp/index.html">Regexp</a>
  +                    <li>    <a href="../regexp/index.html">Regexp</a>
   </li>
  -                    <li>
  -    <a href="../slide/index.html">Slide</a>
  +                    <li>    <a href="../slide/index.html">Slide</a>
   </li>
  -                    <li>
  -    <a href="../struts/index.html">Struts</a>
  +                    <li>    <a href="../struts/index.html">Struts</a>
   </li>
  -                    <li>
  -    <a href="../taglibs/index.html">Taglibs</a>
  +                    <li>    <a href="../taglibs/index.html">Taglibs</a>
   </li>
  -                    <li>
  -    <a href="../tomcat/index.html">Tomcat</a>
  +                    <li>    <a href="../tomcat/index.html">Tomcat</a>
   </li>
  -                    <li>
  -    <a href="../velocity/index.html">Velocity</a>
  +                    <li>    <a href="../velocity/index.html">Velocity</a>
   </li>
  -                    <li>
  -    <a href="../watchdog/index.html">Watchdog</a>
  +                    <li>    <a href="../watchdog/index.html">Watchdog</a>
   </li>
                   </ul>
               <strong>Misc</strong>
  @@ -123,13 +111,11 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
   On Windows, you need one of the following software products for each 
   category:
   </p>
  -                                
  -                <ul>
  +                                                <ul>
    <li>CVS client</li>
     <ul>
      <li><a href="http://www.wincvs.org">WinCVS 1.0 or greater (GUI client)</a></li>
  @@ -141,22 +127,19 @@
      <li><a href="http://www.mindbright.se/mindterm/">MindBright MindTerm SSH</a></li>
     </ul>
   </ul>
  -                                
  -                <p>
  +                                                <p>
   <strong>Note:</strong> since RSA donated their patent on their public key
   crypto algorithm, as well as the US Government reduced restrictions on strong
   crypto import regulations, MindBright states their software can now be used in
   the US.
   </p>
  -                                
  -                <p>
  +                                                <p>
   You can find other SSH clients <a href="http://www.cs.hmc.edu/tech_docs/qref/ssh.html">here</a>
   but the above are the only ones recommended since they do SSH tunneling (most 
   SSH clients just do terminal emulation). If you find any usable software that
   is missing here, please <a href="mailto:webmaster@jakarta.apache.org">inform us.</a>
   </p>
  -                                
  -                <p>
  +                                                <p>
   In addition, if you are behind a corporate firewall, your best option
   is to use a socks proxy. Most SSH software knows how to traverse socks
   proxies. In addition, there are socks utility programs that
  @@ -174,13 +157,11 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
   This is an illustrated example showing the MindTerm program and the 
   WinCVS CVS GUI client.
   </p>
  -                                
  -                <p>
  +                                                <p>
   Assuming you have installed the Mindterm classes (or .jar archive) on your 
   system classpath (and, of course, that you have a Java virtual machine
   available on your system), the first step is turn on the client. 
  @@ -207,15 +188,13 @@
       </tr>
       </table>
       </div>
  -                                
  -                <p>
  +                                                <p>
   Now, go to the tunnels menu and set is up so that local port 2401
   is directed to host "localhost" on the same (you don't need to understand why)
   as showed in the picture below:
   </p>
                                                   <img src="../images/mindterm_tunnel.gif" width="587" height="475" align="">
  -                                
  -                <p>
  +                                                <p>
   When this is done, go ahead and connect to SSH host jakarta.apache.org
   by typing so at the <code>SSH-server:</code> prompt. Then your username
   will be requested and the password. Don't worry about transmitting your
  @@ -223,15 +202,13 @@
   without worrying about sniffing and other security holes of normal 
   remote shells.
   </p>
  -                                
  -                <p>
  +                                                <p>
   When Taz welcomes you and its prompt appears, you can safely minimize your
   mindterm window since, for plain WinCVS operation, you won't need to type
   anything in the ssh terminal. The WinCVS client will send CVS commands thru
   the SSH tunnel transparently.
   </p>
  -                                
  -                <p>
  +                                                <p>
   Then launch the WinCVS client. The first time, it will ask you the basic
   configuration preferences that it needs. These are the CVS repository location
   and authentication information. The screenshot below tells you what you
  @@ -239,8 +216,7 @@
   repository location with your own username on jakarta.
   </p>
                                                   <img src="../images/wincvs_config.gif" width="622" height="517" align="">
  -                                
  -                <p>
  +                                                <p>
   At this point you software is setup and first thing to do is to authenticate
   yourself on the CVS repository. This is done by logging in the server with
   the menu <code>Admin -&gt; Login</code> and inserting your password. This action
  @@ -249,8 +225,7 @@
   that you need to do this only once per CVS repository, not everytime you 
   connect to it, even if you disconnected from that server.
   </p>
  -                                
  -                <p>
  +                                                <p>
   Now your WinCVS client is ready to perform operations on the remote CVS
   repository. First action to take is to <code>checkout</code> the
   jakarta-tomcat module. To do this, first select the directory
  @@ -271,32 +246,27 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
   This is an illustrated example showing the VanDyke SecureCRT SSH
   program and command line CVS.
   </p>
  -                                
  -                <p>
  +                                                <p>
   First, set up SecureCRT to make a connection to jakarta. You should fill
   out the session preferences window to look something like this:
   </p>
                                                   <img src="../images/scrt_ssh_session_prefs.gif" width="428" height="413" align="">
  -                                
  -                <p>
  +                                                <p>
   Next, you'll need to click on the "Advanced" button (next to
   the hostname in the above image) so that you can set up the SSH
   tunnel. Fill it out so that it looks something like this:
   </p>
                                                   <img src="../images/scrt_ssh_adv_options.gif" width="428" height="413" align="">
  -                                
  -                <p>
  +                                                <p>
   Now, just connect. Once you've connected, open up a DOS prompt and
   enter the appropriate cvs commands. Here's a sample session:
   </p>
                                                   <img src="../images/dos_cvs.gif" width="652" height="359" align="">
  -                                
  -                <p>
  +                                                <p>
   Note that this is a DOS prompt on your local machine, not the shell
   prompt that is opened on jakarta by SecureCRT.
   </p>
  
  
  
  1.6       +33 -66    jakarta-site2/docs/site/decisions.html
  
  Index: decisions.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/decisions.html,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- decisions.html	2000/12/11 03:11:50	1.5
  +++ decisions.html	2000/12/13 00:02:06	1.6
  @@ -19,8 +19,7 @@
               <table border="0" width="100%" cellspacing="0">
                   <!-- TOP IMAGE -->
                   <tr>
  -                    
  -<td colspan="2">
  +                    <td colspan="2">
   <a href="http://jakarta.apache.org"><img src="http://jakarta.apache.org/images/jakarta-logo.gif" align="left" border="0"/></a>
   </td>
                   </tr>
  @@ -35,8 +34,7 @@
                       <td valign="top" nowrap="true">
                                   <strong>Essentials</strong>
           <ul>
  -                    <li>
  -    <a href="../index.html">Front Page</a>
  +                    <li>    <a href="../index.html">Front Page</a>
   </li>
                       <li>    <a href="http://jakarta.apache.org/site/news.html">News & Status</a>
   </li>
  @@ -69,35 +67,25 @@
                   </ul>
               <strong>SubProjects</strong>
           <ul>
  -                    <li>
  -    <a href="../ant/index.html">Ant</a>
  +                    <li>    <a href="../ant/index.html">Ant</a>
   </li>
  -                    <li>
  -    <a href="../ecs/index.html">ECS</a>
  +                    <li>    <a href="../ecs/index.html">ECS</a>
   </li>
  -                    <li>
  -    <a href="../oro/index.html">ORO</a>
  +                    <li>    <a href="../oro/index.html">ORO</a>
   </li>
  -                    <li>
  -    <a href="../regexp/index.html">Regexp</a>
  +                    <li>    <a href="../regexp/index.html">Regexp</a>
   </li>
  -                    <li>
  -    <a href="../slide/index.html">Slide</a>
  +                    <li>    <a href="../slide/index.html">Slide</a>
   </li>
  -                    <li>
  -    <a href="../struts/index.html">Struts</a>
  +                    <li>    <a href="../struts/index.html">Struts</a>
   </li>
  -                    <li>
  -    <a href="../taglibs/index.html">Taglibs</a>
  +                    <li>    <a href="../taglibs/index.html">Taglibs</a>
   </li>
  -                    <li>
  -    <a href="../tomcat/index.html">Tomcat</a>
  +                    <li>    <a href="../tomcat/index.html">Tomcat</a>
   </li>
  -                    <li>
  -    <a href="../velocity/index.html">Velocity</a>
  +                    <li>    <a href="../velocity/index.html">Velocity</a>
   </li>
  -                    <li>
  -    <a href="../watchdog/index.html">Watchdog</a>
  +                    <li>    <a href="../watchdog/index.html">Watchdog</a>
   </li>
                   </ul>
               <strong>Misc</strong>
  @@ -123,32 +111,27 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
     All <a href="./roles.html">Developers</a> are encouraged
     to participate in decisions, but the decision itself is made by
     those that have <a href="./roles.html">Committer</a>
     status in the Project. In other words, the Project is a
     "<em>Minimum Threshold Meritocracy</em>".
     </p>
  -                                
  -                <p>
  +                                                <p>
     Any Developer may vote on any issue or action item. However, the
     only binding votes are those cast by a Committer. If the vote is
     about a change to the source code or documentation and the primary
     author is a Developer and not a Commiter, the primary author of what
     is being changed may also cast a binding vote on that issue.
     </p>
  -                                
  -                <p>
  +                                                <p>
     The act of voting carries certain obligations. Voting members are
     not only stating their opinion, they are also agreeing to help do
     the work.
     </p>
  -                                
  -                <p>Each vote can be made in one of three flavors:</p>
  -                                
  -                <table border="0">
  +                                                <p>Each vote can be made in one of three flavors:</p>
  +                                                <table border="0">
     
     <tr valign="top">
     <td width="50"><p><b>+1</b></p></td> <td>"Yes," "Agree," 
  @@ -174,8 +157,7 @@
     </tr>
   
     </table>
  -                                
  -                <p>
  +                                                <p>
     An action requiring consensus approval must receive at least
     <b>3 binding +1</b> votes and <b>no binding
     vetos</b>. An action requiring majority approval must receive
  @@ -186,15 +168,12 @@
     either consensus or majority vote, depending on the type of action
     item.
     </p>
  -                                
  -                <h2>Action Items</h2>
  -                                
  -                <p>
  +                                                <h2>Action Items</h2>
  +                                                <p>
     All decisions revolve around "<em>Action
     Items.</em>" Action Items consist of the following:
     </p>
  -                                
  -                <ul>
  +                                                <ul>
     <li>Long Term Plans</li>
     <li>Short Term Plans</li>
     <li>Release Plan</li>
  @@ -202,57 +181,45 @@
     <li>Showstoppers</li>
     <li>Product Changes</li>
     </ul>
  -                                
  -                <h3>Long Term Plans</h3>
  -                                
  -                <p>
  +                                                <h3>Long Term Plans</h3>
  +                                                <p>
     Long term plans are simply announcements that group members are
     working on particular issues related to the Project. These are not
     voted on, but Developers who do not agree with a particular plan, or
     think that an alternative plan would be better, are obligated to
     inform the group of their feelings.
     </p>
  -                                
  -                <h3>Short Term Plan</h3>
  -                                
  -                <p>
  +                                                <h3>Short Term Plan</h3>
  +                                                <p>
     Short term plans are announcements that a developer is working on a
     particular set of documentation or code files with the implication
     that other developers should avoid them or try to coordinate their
     changes.
     </p>
  -                                
  -                <h3>Release Plan</h3>
  -                                
  -                <p>
  +                                                <h3>Release Plan</h3>
  +                                                <p>
     A release plan is used to keep all Developers aware of when a
     release is desired, who will be the release manager, when the
     repository will be frozen to create a release, and other assorted
     information to keep Developers from tripping over each other. Lazy
     majority decides each issue in a release plan.
     </p>
  -                                
  -                <h3>Release Testing</h3>
  -                                
  -                <p>
  +                                                <h3>Release Testing</h3>
  +                                                <p>
     After a new release is built, it must be tested before being
     released to the public. Majority approval is required before the
     release can be made.
     </p>
  -                                
  -                <h3>Showstoppers</h3>
  -                                
  -                <p>
  +                                                <h3>Showstoppers</h3>
  +                                                <p>
     Showstoppers are issues that require a fix be in place before the
     next public release. They are listed in the status file in order to
     focus special attention on these problems. An issue becomes a
     showstopper when it is listed as such in the status file and remains
     so by lazy consensus.
     </p>
  -                                
  -                <h3>Product Changes</h3>
  -                                
  -                <p>
  +                                                <h3>Product Changes</h3>
  +                                                <p>
     Changes to the products of the Project, including code and
     documentation, will appear as action items in the status file. All
     product changes to the currently active repository are subject to
  
  
  
  1.6       +15 -30    jakarta-site2/docs/site/faqs.html
  
  Index: faqs.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/faqs.html,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- faqs.html	2000/12/11 03:11:50	1.5
  +++ faqs.html	2000/12/13 00:02:06	1.6
  @@ -19,8 +19,7 @@
               <table border="0" width="100%" cellspacing="0">
                   <!-- TOP IMAGE -->
                   <tr>
  -                    
  -<td colspan="2">
  +                    <td colspan="2">
   <a href="http://jakarta.apache.org"><img src="http://jakarta.apache.org/images/jakarta-logo.gif" align="left" border="0"/></a>
   </td>
                   </tr>
  @@ -35,8 +34,7 @@
                       <td valign="top" nowrap="true">
                                   <strong>Essentials</strong>
           <ul>
  -                    <li>
  -    <a href="../index.html">Front Page</a>
  +                    <li>    <a href="../index.html">Front Page</a>
   </li>
                       <li>    <a href="http://jakarta.apache.org/site/news.html">News & Status</a>
   </li>
  @@ -69,35 +67,25 @@
                   </ul>
               <strong>SubProjects</strong>
           <ul>
  -                    <li>
  -    <a href="../ant/index.html">Ant</a>
  +                    <li>    <a href="../ant/index.html">Ant</a>
   </li>
  -                    <li>
  -    <a href="../ecs/index.html">ECS</a>
  +                    <li>    <a href="../ecs/index.html">ECS</a>
   </li>
  -                    <li>
  -    <a href="../oro/index.html">ORO</a>
  +                    <li>    <a href="../oro/index.html">ORO</a>
   </li>
  -                    <li>
  -    <a href="../regexp/index.html">Regexp</a>
  +                    <li>    <a href="../regexp/index.html">Regexp</a>
   </li>
  -                    <li>
  -    <a href="../slide/index.html">Slide</a>
  +                    <li>    <a href="../slide/index.html">Slide</a>
   </li>
  -                    <li>
  -    <a href="../struts/index.html">Struts</a>
  +                    <li>    <a href="../struts/index.html">Struts</a>
   </li>
  -                    <li>
  -    <a href="../taglibs/index.html">Taglibs</a>
  +                    <li>    <a href="../taglibs/index.html">Taglibs</a>
   </li>
  -                    <li>
  -    <a href="../tomcat/index.html">Tomcat</a>
  +                    <li>    <a href="../tomcat/index.html">Tomcat</a>
   </li>
  -                    <li>
  -    <a href="../velocity/index.html">Velocity</a>
  +                    <li>    <a href="../velocity/index.html">Velocity</a>
   </li>
  -                    <li>
  -    <a href="../watchdog/index.html">Watchdog</a>
  +                    <li>    <a href="../watchdog/index.html">Watchdog</a>
   </li>
                   </ul>
               <strong>Misc</strong>
  @@ -123,8 +111,7 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <ul>
  +                                    <ul>
   <li> <b><a href="http://jakarta.apache.org/jyve-faq/Turbine/screen/DisplayTopics/action/SetAll/project_id/2/faq_id/12">Official Jakarta Faq-o-matic</a></b> -
    For Jakarta releated questions, including questions about Ant, Taglibs,
   Tomcat, and Watchdog</li>
  @@ -140,8 +127,7 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <ul>
  +                                    <ul>
   
   <li><a href="http://www.jguru.com/faq/Servlets/">
   jGuru Servlet FAQ</a> including a
  @@ -174,8 +160,7 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <ul>
  +                                    <ul>
   
   <li><b><a href="http://java.sun.com/products/jsp/faq.html">
   Sun's JavaServer Pages FAQ</a></b></li>
  
  
  
  1.6       +18 -36    jakarta-site2/docs/site/getinvolved.html
  
  Index: getinvolved.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/getinvolved.html,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- getinvolved.html	2000/12/11 03:11:50	1.5
  +++ getinvolved.html	2000/12/13 00:02:06	1.6
  @@ -19,8 +19,7 @@
               <table border="0" width="100%" cellspacing="0">
                   <!-- TOP IMAGE -->
                   <tr>
  -                    
  -<td colspan="2">
  +                    <td colspan="2">
   <a href="http://jakarta.apache.org"><img src="http://jakarta.apache.org/images/jakarta-logo.gif" align="left" border="0"/></a>
   </td>
                   </tr>
  @@ -35,8 +34,7 @@
                       <td valign="top" nowrap="true">
                                   <strong>Essentials</strong>
           <ul>
  -                    <li>
  -    <a href="../index.html">Front Page</a>
  +                    <li>    <a href="../index.html">Front Page</a>
   </li>
                       <li>    <a href="http://jakarta.apache.org/site/news.html">News & Status</a>
   </li>
  @@ -69,35 +67,25 @@
                   </ul>
               <strong>SubProjects</strong>
           <ul>
  -                    <li>
  -    <a href="../ant/index.html">Ant</a>
  +                    <li>    <a href="../ant/index.html">Ant</a>
   </li>
  -                    <li>
  -    <a href="../ecs/index.html">ECS</a>
  +                    <li>    <a href="../ecs/index.html">ECS</a>
   </li>
  -                    <li>
  -    <a href="../oro/index.html">ORO</a>
  +                    <li>    <a href="../oro/index.html">ORO</a>
   </li>
  -                    <li>
  -    <a href="../regexp/index.html">Regexp</a>
  +                    <li>    <a href="../regexp/index.html">Regexp</a>
   </li>
  -                    <li>
  -    <a href="../slide/index.html">Slide</a>
  +                    <li>    <a href="../slide/index.html">Slide</a>
   </li>
  -                    <li>
  -    <a href="../struts/index.html">Struts</a>
  +                    <li>    <a href="../struts/index.html">Struts</a>
   </li>
  -                    <li>
  -    <a href="../taglibs/index.html">Taglibs</a>
  +                    <li>    <a href="../taglibs/index.html">Taglibs</a>
   </li>
  -                    <li>
  -    <a href="../tomcat/index.html">Tomcat</a>
  +                    <li>    <a href="../tomcat/index.html">Tomcat</a>
   </li>
  -                    <li>
  -    <a href="../velocity/index.html">Velocity</a>
  +                    <li>    <a href="../velocity/index.html">Velocity</a>
   </li>
  -                    <li>
  -    <a href="../watchdog/index.html">Watchdog</a>
  +                    <li>    <a href="../watchdog/index.html">Watchdog</a>
   </li>
                   </ul>
               <strong>Misc</strong>
  @@ -123,40 +111,34 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
   Every volunteer project obtains its strength from the people involved
   in it. We invite you to participate as much or as little as you
   choose.  The roles and responsibilities that people can assume in the
   project are based on merit. Everybody's input matters!</p>
  -                                
  -                <p>
  +                                                <p>
   There are a variety of ways to participate. Regardless of how you
   choose to participate, we suggest you join some or all of our <a href="./mail.html">mailing lists</a>.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b>Use the Products and Give Us Feedback</b><br /> Using the
   products,reporting bugs, making feature requests, etc. is by far the
   most important role. It's your feedback that allows the technology to
   evolve.  
   
   </p>
  -                                
  -                <ul>
  +                                                <ul>
   <li><a href="./mail.html">Join Mailing Lists</a></li>
   <li><a href="./binindex.html">Download Binary Builds</a></li>
   <li><a href="./bugs.html">Report bugs/Request additional features</a></li>
   </ul>
  -                                
  -                <p>
  +                                                <p>
   <b>Contribute Code or Documentation Patches</b><br />
   In this role, you participate in the actual development of the code. 
   If this is the type of role you'd like to play, here are some steps 
   (in addition to the ones above) to get you started:
   </p>
  -                                
  -                <ul>
  +                                                <ul>
   <li><a href="./guidelines.html">Read Guidelines</a></li>
   <li><a href="./library.html">Review Reference Library</a></li>
   <li><a href="./sourceindex.html">Download the Source Code</a></li>
  
  
  
  1.6       +15 -30    jakarta-site2/docs/site/guidelines.html
  
  Index: guidelines.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/guidelines.html,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- guidelines.html	2000/12/11 03:11:50	1.5
  +++ guidelines.html	2000/12/13 00:02:06	1.6
  @@ -19,8 +19,7 @@
               <table border="0" width="100%" cellspacing="0">
                   <!-- TOP IMAGE -->
                   <tr>
  -                    
  -<td colspan="2">
  +                    <td colspan="2">
   <a href="http://jakarta.apache.org"><img src="http://jakarta.apache.org/images/jakarta-logo.gif" align="left" border="0"/></a>
   </td>
                   </tr>
  @@ -35,8 +34,7 @@
                       <td valign="top" nowrap="true">
                                   <strong>Essentials</strong>
           <ul>
  -                    <li>
  -    <a href="../index.html">Front Page</a>
  +                    <li>    <a href="../index.html">Front Page</a>
   </li>
                       <li>    <a href="http://jakarta.apache.org/site/news.html">News & Status</a>
   </li>
  @@ -69,35 +67,25 @@
                   </ul>
               <strong>SubProjects</strong>
           <ul>
  -                    <li>
  -    <a href="../ant/index.html">Ant</a>
  +                    <li>    <a href="../ant/index.html">Ant</a>
   </li>
  -                    <li>
  -    <a href="../ecs/index.html">ECS</a>
  +                    <li>    <a href="../ecs/index.html">ECS</a>
   </li>
  -                    <li>
  -    <a href="../oro/index.html">ORO</a>
  +                    <li>    <a href="../oro/index.html">ORO</a>
   </li>
  -                    <li>
  -    <a href="../regexp/index.html">Regexp</a>
  +                    <li>    <a href="../regexp/index.html">Regexp</a>
   </li>
  -                    <li>
  -    <a href="../slide/index.html">Slide</a>
  +                    <li>    <a href="../slide/index.html">Slide</a>
   </li>
  -                    <li>
  -    <a href="../struts/index.html">Struts</a>
  +                    <li>    <a href="../struts/index.html">Struts</a>
   </li>
  -                    <li>
  -    <a href="../taglibs/index.html">Taglibs</a>
  +                    <li>    <a href="../taglibs/index.html">Taglibs</a>
   </li>
  -                    <li>
  -    <a href="../tomcat/index.html">Tomcat</a>
  +                    <li>    <a href="../tomcat/index.html">Tomcat</a>
   </li>
  -                    <li>
  -    <a href="../velocity/index.html">Velocity</a>
  +                    <li>    <a href="../velocity/index.html">Velocity</a>
   </li>
  -                    <li>
  -    <a href="../watchdog/index.html">Watchdog</a>
  +                    <li>    <a href="../watchdog/index.html">Watchdog</a>
   </li>
                   </ul>
               <strong>Misc</strong>
  @@ -123,16 +111,14 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
     This document defines the guidelines of The Jakarta Project. It
     includes definitions of the various categories of membership, who is
     able to vote, how conflicts are resolved by voting, and the procedures
     to follow for proposing and making changes to the codebase of the
     Project.
     </p>
  -                                
  -                <ul>
  +                                                <ul>
   
     <li><a href="./roles.html">Roles and Responsibilities</a><br /> <span class="itemdef">Defines the recognized roles in the project.</span></li>
     
  @@ -148,8 +134,7 @@
     Project Management Committee (PMC). </span></li>
   
     </ul>
  -                                
  -                <p>
  +                                                <p>
     This is a living document. Changes can be made by the Project
     Management Committee.
     </p>
  
  
  
  1.4       +27 -54    jakarta-site2/docs/site/jakarta-site2.html
  
  Index: jakarta-site2.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/jakarta-site2.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- jakarta-site2.html	2000/12/11 03:11:50	1.3
  +++ jakarta-site2.html	2000/12/13 00:02:07	1.4
  @@ -19,8 +19,7 @@
               <table border="0" width="100%" cellspacing="0">
                   <!-- TOP IMAGE -->
                   <tr>
  -                    
  -<td colspan="2">
  +                    <td colspan="2">
   <a href="http://jakarta.apache.org"><img src="http://jakarta.apache.org/images/jakarta-logo.gif" align="left" border="0"/></a>
   </td>
                   </tr>
  @@ -35,8 +34,7 @@
                       <td valign="top" nowrap="true">
                                   <strong>Essentials</strong>
           <ul>
  -                    <li>
  -    <a href="../index.html">Front Page</a>
  +                    <li>    <a href="../index.html">Front Page</a>
   </li>
                       <li>    <a href="http://jakarta.apache.org/site/news.html">News & Status</a>
   </li>
  @@ -69,35 +67,25 @@
                   </ul>
               <strong>SubProjects</strong>
           <ul>
  -                    <li>
  -    <a href="../ant/index.html">Ant</a>
  +                    <li>    <a href="../ant/index.html">Ant</a>
   </li>
  -                    <li>
  -    <a href="../ecs/index.html">ECS</a>
  +                    <li>    <a href="../ecs/index.html">ECS</a>
   </li>
  -                    <li>
  -    <a href="../oro/index.html">ORO</a>
  +                    <li>    <a href="../oro/index.html">ORO</a>
   </li>
  -                    <li>
  -    <a href="../regexp/index.html">Regexp</a>
  +                    <li>    <a href="../regexp/index.html">Regexp</a>
   </li>
  -                    <li>
  -    <a href="../slide/index.html">Slide</a>
  +                    <li>    <a href="../slide/index.html">Slide</a>
   </li>
  -                    <li>
  -    <a href="../struts/index.html">Struts</a>
  +                    <li>    <a href="../struts/index.html">Struts</a>
   </li>
  -                    <li>
  -    <a href="../taglibs/index.html">Taglibs</a>
  +                    <li>    <a href="../taglibs/index.html">Taglibs</a>
   </li>
  -                    <li>
  -    <a href="../tomcat/index.html">Tomcat</a>
  +                    <li>    <a href="../tomcat/index.html">Tomcat</a>
   </li>
  -                    <li>
  -    <a href="../velocity/index.html">Velocity</a>
  +                    <li>    <a href="../velocity/index.html">Velocity</a>
   </li>
  -                    <li>
  -    <a href="../watchdog/index.html">Watchdog</a>
  +                    <li>    <a href="../watchdog/index.html">Watchdog</a>
   </li>
                   </ul>
               <strong>Misc</strong>
  @@ -123,8 +111,7 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
   If you would like to use the jakarta-site2 module as a dependency for your 
   project, here are the instructions for how to do that. The benefit of using it 
   as a dependency is that you will be able to easily adopt the look and feel of 
  @@ -132,8 +119,7 @@
   your own project's documentation navigation. It is the recommended, but optional 
   way to develop documentation for projects hosted under the main Jakarta Project.
   </p>
  -                                
  -                <p>
  +                                                <p>
   Currently, the jakarta-site2 module uses Anakia to do the XML-&gt;HTML 
   transformations. Therefore, it is highly recommended that you read the Anakia <a href="/velocity/anakia.html">documentation</a> in order to get an overview of 
   what you are dealing with (it really is quite simple as you will soon discover).
  @@ -149,8 +135,7 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
   Check out the jakarta-site2 module into a directory that is "next" to your 
   current project directory.
   </p>
  @@ -178,8 +163,7 @@
       </tr>
       </table>
       </div>
  -                                
  -                <p>Your directory structure should then look something like this:</p>
  +                                                <p>Your directory structure should then look something like this:</p>
                                                       <div align="left">
       <table cellspacing="4" cellpadding="0" border="0">
       <tr>
  @@ -216,16 +200,14 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
       The jakarta-site2 module has an /examples directory. Within there
       is a jakarta-myproject directory that you can copy into your /projects directory.
       This directory has everything that you need to get started with the documentation
       portion of your project. Essentially, it contains all of the files and configuration
       that is documented below.
     </p>
  -                                
  -                <p>
  +                                                <p>
       Once you have copied the directory into /projects, you should read the 
       instructions below to get a feeling for where everything is and how things 
       are configured.
  @@ -241,8 +223,7 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>You should first create a directory structure within your project that can be used 
  +                                    <p>You should first create a directory structure within your project that can be used 
   to store your documentation:</p>
                                                       <div align="left">
       <table cellspacing="4" cellpadding="0" border="0">
  @@ -279,13 +260,11 @@
       </tr>
       </table>
       </div>
  -                                
  -                <p>
  +                                                <p>
   Copy the project.xml file from the jakarta-site2/xdocs/stylesheets/ directory 
   into your jakarta-myproject/xdocs/stylesheets/ directory.
   </p>
  -                                
  -                <p>
  +                                                <p>
   You will need to make a copy of the velocity.properties file from the jakarta-
   site2 module. Place it into the xdocs directory as outlined above. Within the 
   file, you should modify the property shown below to point to the stylesheets 
  @@ -315,8 +294,7 @@
       </tr>
       </table>
       </div>
  -                                
  -                <p>
  +                                                <p>
   Assuming that you are using <a href="/ant/index.html">Ant</a> as your build tool 
   for your project, you should then be able to copy/paste the appropriate targets 
   from the jakarta-site2/build.xml file into your own build.xml file for your 
  @@ -379,8 +357,7 @@
       </tr>
       </table>
       </div>
  -                                
  -                <p>Below is an example of what your build.sh file should look like. What is important
  +                                                <p>Below is an example of what your build.sh file should look like. What is important
   to note is that it is building up the CLASSPATH to find the .jar files for Anakia. 
   Because it adds itself to the CLASSPATH after you do, any .jar files in your project
   that duplicate the .jar files needed by Anakia will take precedence. So, if there 
  @@ -452,8 +429,7 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>Now, in order to build your website, all you need to do is:</p>
  +                                    <p>Now, in order to build your website, all you need to do is:</p>
                                                       <div align="left">
       <table cellspacing="4" cellpadding="0" border="0">
       <tr>
  @@ -474,13 +450,11 @@
       </tr>
       </table>
       </div>
  -                                
  -                <p>
  +                                                <p>
       The documentation will then be generated into the jakarta-myproject/docs 
       directory.
       </p>
  -                                
  -                <p>
  +                                                <p>
       If you take a look at the project.xml file within your xdocs/stylesheets 
       directory, you will notice that it is the side navigation portion of the 
       website. If you want your project logo to appear in the upper right corner 
  @@ -489,8 +463,7 @@
       logo. If your project has its own navigation needs, simply modify the 
       &lt;menu&gt; tags and place in your own navigation elements.
       </p>
  -                                
  -                <p>
  +                                                <p>
       Within your xdocs directory is also a sample index.xml file. It shows the 
       basic things that you need to modify to create your own page. You can embed 
       whatever HTML you want into this file so long as it conforms to the XHTML 
  
  
  
  1.5       +14 -28    jakarta-site2/docs/site/legal.html
  
  Index: legal.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/legal.html,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- legal.html	2000/12/11 03:11:50	1.4
  +++ legal.html	2000/12/13 00:02:07	1.5
  @@ -19,8 +19,7 @@
               <table border="0" width="100%" cellspacing="0">
                   <!-- TOP IMAGE -->
                   <tr>
  -                    
  -<td colspan="2">
  +                    <td colspan="2">
   <a href="http://jakarta.apache.org"><img src="http://jakarta.apache.org/images/jakarta-logo.gif" align="left" border="0"/></a>
   </td>
                   </tr>
  @@ -35,8 +34,7 @@
                       <td valign="top" nowrap="true">
                                   <strong>Essentials</strong>
           <ul>
  -                    <li>
  -    <a href="../index.html">Front Page</a>
  +                    <li>    <a href="../index.html">Front Page</a>
   </li>
                       <li>    <a href="http://jakarta.apache.org/site/news.html">News & Status</a>
   </li>
  @@ -69,35 +67,25 @@
                   </ul>
               <strong>SubProjects</strong>
           <ul>
  -                    <li>
  -    <a href="../ant/index.html">Ant</a>
  +                    <li>    <a href="../ant/index.html">Ant</a>
   </li>
  -                    <li>
  -    <a href="../ecs/index.html">ECS</a>
  +                    <li>    <a href="../ecs/index.html">ECS</a>
   </li>
  -                    <li>
  -    <a href="../oro/index.html">ORO</a>
  +                    <li>    <a href="../oro/index.html">ORO</a>
   </li>
  -                    <li>
  -    <a href="../regexp/index.html">Regexp</a>
  +                    <li>    <a href="../regexp/index.html">Regexp</a>
   </li>
  -                    <li>
  -    <a href="../slide/index.html">Slide</a>
  +                    <li>    <a href="../slide/index.html">Slide</a>
   </li>
  -                    <li>
  -    <a href="../struts/index.html">Struts</a>
  +                    <li>    <a href="../struts/index.html">Struts</a>
   </li>
  -                    <li>
  -    <a href="../taglibs/index.html">Taglibs</a>
  +                    <li>    <a href="../taglibs/index.html">Taglibs</a>
   </li>
  -                    <li>
  -    <a href="../tomcat/index.html">Tomcat</a>
  +                    <li>    <a href="../tomcat/index.html">Tomcat</a>
   </li>
  -                    <li>
  -    <a href="../velocity/index.html">Velocity</a>
  +                    <li>    <a href="../velocity/index.html">Velocity</a>
   </li>
  -                    <li>
  -    <a href="../watchdog/index.html">Watchdog</a>
  +                    <li>    <a href="../watchdog/index.html">Watchdog</a>
   </li>
                   </ul>
               <strong>Misc</strong>
  @@ -123,13 +111,11 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
   All material on this website is Copyright � 1999-2000, The Apache 
   Software Foundation
   </p>
  -                                
  -                <p>
  +                                                <p>
   Sun, Sun Microsystems, Solaris, Java, JavaServer Web Development Kit, 
   and JavaServer Pages are trademarks or registered trademarks of Sun 
   Microsystems, Inc. UNIX is a registered trademark in the United States 
  
  
  
  1.6       +24 -48    jakarta-site2/docs/site/library.html
  
  Index: library.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/library.html,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- library.html	2000/12/11 03:11:50	1.5
  +++ library.html	2000/12/13 00:02:07	1.6
  @@ -19,8 +19,7 @@
               <table border="0" width="100%" cellspacing="0">
                   <!-- TOP IMAGE -->
                   <tr>
  -                    
  -<td colspan="2">
  +                    <td colspan="2">
   <a href="http://jakarta.apache.org"><img src="http://jakarta.apache.org/images/jakarta-logo.gif" align="left" border="0"/></a>
   </td>
                   </tr>
  @@ -35,8 +34,7 @@
                       <td valign="top" nowrap="true">
                                   <strong>Essentials</strong>
           <ul>
  -                    <li>
  -    <a href="../index.html">Front Page</a>
  +                    <li>    <a href="../index.html">Front Page</a>
   </li>
                       <li>    <a href="http://jakarta.apache.org/site/news.html">News & Status</a>
   </li>
  @@ -69,35 +67,25 @@
                   </ul>
               <strong>SubProjects</strong>
           <ul>
  -                    <li>
  -    <a href="../ant/index.html">Ant</a>
  +                    <li>    <a href="../ant/index.html">Ant</a>
   </li>
  -                    <li>
  -    <a href="../ecs/index.html">ECS</a>
  +                    <li>    <a href="../ecs/index.html">ECS</a>
   </li>
  -                    <li>
  -    <a href="../oro/index.html">ORO</a>
  +                    <li>    <a href="../oro/index.html">ORO</a>
   </li>
  -                    <li>
  -    <a href="../regexp/index.html">Regexp</a>
  +                    <li>    <a href="../regexp/index.html">Regexp</a>
   </li>
  -                    <li>
  -    <a href="../slide/index.html">Slide</a>
  +                    <li>    <a href="../slide/index.html">Slide</a>
   </li>
  -                    <li>
  -    <a href="../struts/index.html">Struts</a>
  +                    <li>    <a href="../struts/index.html">Struts</a>
   </li>
  -                    <li>
  -    <a href="../taglibs/index.html">Taglibs</a>
  +                    <li>    <a href="../taglibs/index.html">Taglibs</a>
   </li>
  -                    <li>
  -    <a href="../tomcat/index.html">Tomcat</a>
  +                    <li>    <a href="../tomcat/index.html">Tomcat</a>
   </li>
  -                    <li>
  -    <a href="../velocity/index.html">Velocity</a>
  +                    <li>    <a href="../velocity/index.html">Velocity</a>
   </li>
  -                    <li>
  -    <a href="../watchdog/index.html">Watchdog</a>
  +                    <li>    <a href="../watchdog/index.html">Watchdog</a>
   </li>
                   </ul>
               <strong>Misc</strong>
  @@ -123,8 +111,7 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
   The Jakarta Project lives or fails based on its human resources. Users and contributors alike help the
   project with ideas and brainpower. A common foundation of knowledge is required to effectively
   participate in this virtual community. The following is a list of documents that we have found helpful
  @@ -141,69 +128,58 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
   These resources are required reading for anybody contributing source code to the project. 
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b><a href="http://java.sun.com/docs/books/jls/index.html">The Java Language Specification</a></b><br />
   Written by the creators of the Java Programming Language, this online book is considered by many
   to be the bible for programming in Java. A must read.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b><a href="http://java.sun.com/products/jdk/javadoc/index.html">Javadoc</a></b><br />
   Javadoc is the automatic software documentation generator used by Java since it was first released.
   All code written for this project must be documented using Javadoc conventions.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b><a href="http://java.sun.com/docs/codeconv/html/CodeConvTOC.doc.html">The Java Code Conventions</a></b><br />
   This Sun document specifies the de-facto standard way of formatting Java code. All code written for
   this project must follow these conventions.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b><a href="http://cvsbook.red-bean.com/">Open Source Development with CVS</a></b><br />
   Written by Karl Fogel, this is an online version of many of the primary
   chapters from the dead-tree version of his book.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b><a href="http://www.cyclic.com/cvs/doc-blandy.html">Introduction to CVS</a></b><br />
   Written by Jim Blandy, this brief introduction gives a first look into CVS. If you have never used
   CVS before, you'll want to start here.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b><a href="http://www.cyclic.com/cvs/doc-cederqvist.html">Version Management with CVS</a></b><br />
   Written by Per Cederqvist at al, this is the main manual for CVS. It provides details on all
   documented CVS features.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <h3>Source Code Philosophy Resources </h3>
   The following are a set of articles written about the recent source code movements that help
   illustrate some of the attributes of a collaborative project such as this. You may not agree with all of
   the points of these articles, but an understanding of them will help in communicating with everyone
   on the project. 
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b><a href="http://www.tuxedo.org/%7Eesr/writings/cathedral-bazaar/index.html">The Cathedral and the Bazaar</a></b><br />
   Written by Eric S. Raymond, this is a must read for anyone willing to join or support a volunteer
   project.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b><a href="http://www.tuxedo.org/%7Eesr/writings/homesteading/index.html">Homesteading the Noosphere</a></b><br />
   Written by Eric S. Raymond, this is a sequel to "The Cathedral and the Bazaar". It details the
   property and ownership customs of the open-source culture. This analysis has larg implications for
   anyone interested in organizing large-scale intellectual collaborations such as this project.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b><a href="http://www.sun.com/981208/scsl/principles.html">Sun Community Source License Principles</a></b><br />
   Written by Richard Gabriel and Bill Joy, this document gives an overview of the principles behind
   Community Source, the source code licensing model that the majority of the Java Platform is licensed
  
  
  
  1.6       +19 -38    jakarta-site2/docs/site/management.html
  
  Index: management.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/management.html,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- management.html	2000/12/11 03:11:50	1.5
  +++ management.html	2000/12/13 00:02:07	1.6
  @@ -19,8 +19,7 @@
               <table border="0" width="100%" cellspacing="0">
                   <!-- TOP IMAGE -->
                   <tr>
  -                    
  -<td colspan="2">
  +                    <td colspan="2">
   <a href="http://jakarta.apache.org"><img src="http://jakarta.apache.org/images/jakarta-logo.gif" align="left" border="0"/></a>
   </td>
                   </tr>
  @@ -35,8 +34,7 @@
                       <td valign="top" nowrap="true">
                                   <strong>Essentials</strong>
           <ul>
  -                    <li>
  -    <a href="../index.html">Front Page</a>
  +                    <li>    <a href="../index.html">Front Page</a>
   </li>
                       <li>    <a href="http://jakarta.apache.org/site/news.html">News & Status</a>
   </li>
  @@ -69,35 +67,25 @@
                   </ul>
               <strong>SubProjects</strong>
           <ul>
  -                    <li>
  -    <a href="../ant/index.html">Ant</a>
  +                    <li>    <a href="../ant/index.html">Ant</a>
   </li>
  -                    <li>
  -    <a href="../ecs/index.html">ECS</a>
  +                    <li>    <a href="../ecs/index.html">ECS</a>
   </li>
  -                    <li>
  -    <a href="../oro/index.html">ORO</a>
  +                    <li>    <a href="../oro/index.html">ORO</a>
   </li>
  -                    <li>
  -    <a href="../regexp/index.html">Regexp</a>
  +                    <li>    <a href="../regexp/index.html">Regexp</a>
   </li>
  -                    <li>
  -    <a href="../slide/index.html">Slide</a>
  +                    <li>    <a href="../slide/index.html">Slide</a>
   </li>
  -                    <li>
  -    <a href="../struts/index.html">Struts</a>
  +                    <li>    <a href="../struts/index.html">Struts</a>
   </li>
  -                    <li>
  -    <a href="../taglibs/index.html">Taglibs</a>
  +                    <li>    <a href="../taglibs/index.html">Taglibs</a>
   </li>
  -                    <li>
  -    <a href="../tomcat/index.html">Tomcat</a>
  +                    <li>    <a href="../tomcat/index.html">Tomcat</a>
   </li>
  -                    <li>
  -    <a href="../velocity/index.html">Velocity</a>
  +                    <li>    <a href="../velocity/index.html">Velocity</a>
   </li>
  -                    <li>
  -    <a href="../watchdog/index.html">Watchdog</a>
  +                    <li>    <a href="../watchdog/index.html">Watchdog</a>
   </li>
                   </ul>
               <strong>Misc</strong>
  @@ -123,8 +111,7 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
   The Project Management Committee (PMC) was formed by the Apache Board
   in September 1999.  This Committee consists of 9 founding members, one
   of whom is the founding Chairman. The term of the Chairman is one
  @@ -132,8 +119,7 @@
   can be found in our <a href="../credits/whoweare.html"> Project
   Credits</a>.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b>Roles</b><br /> The PMC is responsible for the strategic direction
   and success of the Jakarta Project. This governing body is expected to
   ensure the project's welfare and guide its overall direction. The PMC
  @@ -142,13 +128,11 @@
   bottlenecks, the resolution of conflicts, and the overall technical
   success of the project.
   </p>
  -                                
  -                <p>
  +                                                <p>
   The PMC is answerable to the Apache Board with its Chairman serving as
   primary liaison.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b>Meetings</b><br /> The PMC meets monthly with a majority of its
   members to discuss issues, determine strategic direction, and forward
   progress. These meetings may take place online, via teleconference, or
  @@ -156,22 +140,19 @@
   meeting at which time a new Chairman is elected. The old Chairman
   maintains membership status.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b>Membership</b><br /> PMC members may resign at any time. The Chairman
   may resign as Chairman at any time without resigning membership to the
   PMC. The Chairman or any member may be removed from the PMC by a 3/4
   vote of the PMC.
   </p>
  -                                
  -                <p>
  +                                                <p>
   New members may be elected to the PMC. In order to be elected, a
   person must have served as a <a href="roles.html">Committer</a> and be
   nominated by a PMC Member. Once nominated, all of the PMC will vote
   and those receiving a 3/4 positive vote will become a member.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b>Creation of subprojects</b><br /> PMC members may propose the creation
   of new subprojects.  Proposals are to contain the scope of the project,
   identify the initial source from which the project is to be populated,
  
  
  
  1.6       +13 -26    jakarta-site2/docs/site/mission.html
  
  Index: mission.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/mission.html,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mission.html	2000/12/11 03:11:50	1.5
  +++ mission.html	2000/12/13 00:02:07	1.6
  @@ -19,8 +19,7 @@
               <table border="0" width="100%" cellspacing="0">
                   <!-- TOP IMAGE -->
                   <tr>
  -                    
  -<td colspan="2">
  +                    <td colspan="2">
   <a href="http://jakarta.apache.org"><img src="http://jakarta.apache.org/images/jakarta-logo.gif" align="left" border="0"/></a>
   </td>
                   </tr>
  @@ -35,8 +34,7 @@
                       <td valign="top" nowrap="true">
                                   <strong>Essentials</strong>
           <ul>
  -                    <li>
  -    <a href="../index.html">Front Page</a>
  +                    <li>    <a href="../index.html">Front Page</a>
   </li>
                       <li>    <a href="http://jakarta.apache.org/site/news.html">News & Status</a>
   </li>
  @@ -69,35 +67,25 @@
                   </ul>
               <strong>SubProjects</strong>
           <ul>
  -                    <li>
  -    <a href="../ant/index.html">Ant</a>
  +                    <li>    <a href="../ant/index.html">Ant</a>
   </li>
  -                    <li>
  -    <a href="../ecs/index.html">ECS</a>
  +                    <li>    <a href="../ecs/index.html">ECS</a>
   </li>
  -                    <li>
  -    <a href="../oro/index.html">ORO</a>
  +                    <li>    <a href="../oro/index.html">ORO</a>
   </li>
  -                    <li>
  -    <a href="../regexp/index.html">Regexp</a>
  +                    <li>    <a href="../regexp/index.html">Regexp</a>
   </li>
  -                    <li>
  -    <a href="../slide/index.html">Slide</a>
  +                    <li>    <a href="../slide/index.html">Slide</a>
   </li>
  -                    <li>
  -    <a href="../struts/index.html">Struts</a>
  +                    <li>    <a href="../struts/index.html">Struts</a>
   </li>
  -                    <li>
  -    <a href="../taglibs/index.html">Taglibs</a>
  +                    <li>    <a href="../taglibs/index.html">Taglibs</a>
   </li>
  -                    <li>
  -    <a href="../tomcat/index.html">Tomcat</a>
  +                    <li>    <a href="../tomcat/index.html">Tomcat</a>
   </li>
  -                    <li>
  -    <a href="../velocity/index.html">Velocity</a>
  +                    <li>    <a href="../velocity/index.html">Velocity</a>
   </li>
  -                    <li>
  -    <a href="../watchdog/index.html">Watchdog</a>
  +                    <li>    <a href="../watchdog/index.html">Watchdog</a>
   </li>
                   </ul>
               <strong>Misc</strong>
  @@ -123,8 +111,7 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
   <b>Provide commercial-quality server solutions based on the Java
   Platform that are developed in an open and cooperative fashion.</b>
   </p>
  
  
  
  1.9       +88 -128   jakarta-site2/docs/site/news.html
  
  Index: news.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/news.html,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- news.html	2000/12/11 03:11:50	1.8
  +++ news.html	2000/12/13 00:02:07	1.9
  @@ -19,8 +19,7 @@
               <table border="0" width="100%" cellspacing="0">
                   <!-- TOP IMAGE -->
                   <tr>
  -                    
  -<td colspan="2">
  +                    <td colspan="2">
   <a href="http://jakarta.apache.org"><img src="http://jakarta.apache.org/images/jakarta-logo.gif" align="left" border="0"/></a>
   </td>
                   </tr>
  @@ -35,8 +34,7 @@
                       <td valign="top" nowrap="true">
                                   <strong>Essentials</strong>
           <ul>
  -                    <li>
  -    <a href="../index.html">Front Page</a>
  +                    <li>    <a href="../index.html">Front Page</a>
   </li>
                       <li>    <a href="http://jakarta.apache.org/site/news.html">News & Status</a>
   </li>
  @@ -69,35 +67,25 @@
                   </ul>
               <strong>SubProjects</strong>
           <ul>
  -                    <li>
  -    <a href="../ant/index.html">Ant</a>
  +                    <li>    <a href="../ant/index.html">Ant</a>
   </li>
  -                    <li>
  -    <a href="../ecs/index.html">ECS</a>
  +                    <li>    <a href="../ecs/index.html">ECS</a>
   </li>
  -                    <li>
  -    <a href="../oro/index.html">ORO</a>
  +                    <li>    <a href="../oro/index.html">ORO</a>
   </li>
  -                    <li>
  -    <a href="../regexp/index.html">Regexp</a>
  +                    <li>    <a href="../regexp/index.html">Regexp</a>
   </li>
  -                    <li>
  -    <a href="../slide/index.html">Slide</a>
  +                    <li>    <a href="../slide/index.html">Slide</a>
   </li>
  -                    <li>
  -    <a href="../struts/index.html">Struts</a>
  +                    <li>    <a href="../struts/index.html">Struts</a>
   </li>
  -                    <li>
  -    <a href="../taglibs/index.html">Taglibs</a>
  +                    <li>    <a href="../taglibs/index.html">Taglibs</a>
   </li>
  -                    <li>
  -    <a href="../tomcat/index.html">Tomcat</a>
  +                    <li>    <a href="../tomcat/index.html">Tomcat</a>
   </li>
  -                    <li>
  -    <a href="../velocity/index.html">Velocity</a>
  +                    <li>    <a href="../velocity/index.html">Velocity</a>
   </li>
  -                    <li>
  -    <a href="../watchdog/index.html">Watchdog</a>
  +                    <li>    <a href="../watchdog/index.html">Watchdog</a>
   </li>
                   </ul>
               <strong>Misc</strong>
  @@ -123,19 +111,38 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <h3>11-27-00 - Jakarta Regexp 1.2 Available</h3>
  -                                
  -                <p>
  +                                    <h3>12-12-00 - Tomcat 3.1.1 and Tomcat 3.2.1 Security Fix Releases</h3>
  +                                                <p>Recently, several security vulnerabilities have been identified in both
  +Tomcat 3.1 and Tomcat 3.2.  To deal with these issues, maintenance releases
  +of each Tomcat version have been prepared:
  +<a href="http://jakarta.apache.org/builds/tomcat/release/v3.1.1/bin">Tomcat 3.1.1</a> and
  +<a href="http://jakarta.apache.org/builds/tomcat/release/v3.2.1/bin">Tomcat 3.2.1</a>.
  +Please see the file <code>doc/readme</code> in each download to read the
  +Release Notes for that version.  In each case, you will not need to modify
  +any native code components used to integrate Tomcat with a web server --
  +all of the changes affect only the Java components under the
  +<code>$TOMCAT_HOME</code> directory.</p>
  +                                                <h3>11-29-00 - Tomcat 3.2 Final Release Available</h3>
  +                                                <p>
  +The most anticipated release from the Jakarta project yet!  We hereby announce
  +the availability of the <strong>final release</strong> of version 3.2 of the
  +Tomcat servlet container and JSP engine.  Tomcat implements the Servlet 2.2
  +and JSP 1.1
  +specifications, and represents the most current release quality build of this
  +project.  Compared to version 3.1, there have been substantial improvements
  +in performance, many new features (including support for SSL connections),
  +and well over one hundred bug fixes.  Pick up the binary distribution at
  +<a href="http://jakarta.apache.org/builds/tomcat/release/v3.2/bin">http://jakarta.apache.org/builds/tomcat/release/v3.2/bin</a>.
  +</p>
  +                                                <hr noshade="" size="1" />
  +                                                <h3>11-27-00 - Jakarta Regexp 1.2 Available</h3>
  +                                                <p>
   We proudly announce the release 1.2 of the Jakarta Regexp project. Please
   see the <a href="/regexp/changes.html">Changes</a> document for more information.
   </p>
  -                                
  -                <hr noshade="" size="1" />
  -                                
  -                <h3>11-26-00 - New Website Design</h3>
  -                                
  -                <p>We finally have a new website design! The old one was getting stale and we 
  +                                                <hr noshade="" size="1" />
  +                                                <h3>11-26-00 - New Website Design</h3>
  +                                                <p>We finally have a new website design! The old one was getting stale and we 
   needed to update our look. We also have a new <a href="/site/jakarta-site2.html">process</a> 
   that allows our sub-projects to easily adopt the same 
   look and feel as our primary site. The site is now being generated from XML 
  @@ -145,21 +152,15 @@
   problems with the site, everything is checked into <a href="/cvsweb/index.cgi/jakarta-site2/">CVS</a> and we 
   would appreciate <a href="./contact.html">sending</a> us patches to fix the 
   problems.</p>
  -                                
  -                <hr noshade="" size="1" />
  -                                
  -                <h3>7-23-00 - Jakarta-ORO Project Now Available</h3>
  -                                
  -                <p>A couple months ago we announced that Daniel F. Savarese would be donating his 
  +                                                <hr noshade="" size="1" />
  +                                                <h3>7-23-00 - Jakarta-ORO Project Now Available</h3>
  +                                                <p>A couple months ago we announced that Daniel F. Savarese would be donating his 
   OROMatcher Regular Expression code to the Jakarta Project. After a long delay 
   due to time constraints, we are proud to finally announce that the code is 
   available! <a href="/oro/index.html">Come and get it!</a></p>
  -                                
  -                <hr noshade="" size="1" />
  -                                
  -                <h3>5-31-00 - New Struts Subproject Started</h3>
  -                                
  -                <p>Craig McClanahan has contributed a small framework for building web
  +                                                <hr noshade="" size="1" />
  +                                                <h3>5-31-00 - New Struts Subproject Started</h3>
  +                                                <p>Craig McClanahan has contributed a small framework for building web
   applications using the Model-View-Controller (MVC) design pattern commonly
   known as "Model 2" to the Jakarta project.  The "Struts" project will serve
   as a platform for exploring the optimum approaches to implementing
  @@ -170,34 +171,26 @@
   version 1.1 or later (such as Tomcat).  See the
   <a href="/struts/index.html">subproject home page</a> for more information
   about Struts.</p>
  -                                
  -                <p>Feel free to subscribe to the STRUTS-DEV mailing list if you wish to
  +                                                <p>Feel free to subscribe to the STRUTS-DEV mailing list if you wish to
   participate in the development of Struts itself, or the STRUTS-USER mailing
   list if you are a developer wishing to use Struts in your own applications.
   Instructions for subscribing to these mailing lists may be found
   <a href="./mail.html">here</a>.
   </p>
  -                                
  -                <hr noshade="" size="1" />
  -                                
  -                <h3>5-17-00 - New WebDAV Subproject Started</h3>
  -                                
  -                <p>Remy Maucherat (remm@exoffice.com) has graciously agreed to contribute
  +                                                <hr noshade="" size="1" />
  +                                                <h3>5-17-00 - New WebDAV Subproject Started</h3>
  +                                                <p>Remy Maucherat (remm@exoffice.com) has graciously agreed to contribute
   his WebDAV implementation to the Jakarta project.  To host this code, a new
   subproject named <strong>jakarta-slide</strong> has been created.  Slide
   provides both a content management API, and a servlet that runs in any
   2.2-compliant servlet engine, to implement the WebDAV protocol standards.</p>
  -                                
  -                <p>Feel free to subscribe to the SLIDE-DEV (developers) and SLIDE-USER (users)
  +                                                <p>Feel free to subscribe to the SLIDE-DEV (developers) and SLIDE-USER (users)
   mailing lists on the <a href="./mail.html">Mailing Lists</a>
   page, and to read more about Slide on its <a href="/slide/index.html">Project Page</a>.
   </p>
  -                                
  -                <hr noshade="" size="1" />
  -                                
  -                <h3>5-14-00 - New Code Donation</h3>
  -                                
  -                <p>
  +                                                <hr noshade="" size="1" />
  +                                                <h3>5-14-00 - New Code Donation</h3>
  +                                                <p>
   We are proud to announce that Daniel F. Savarese has decided to not
   release his <a href="http://www.savarese.org/oro/">OROMatcher Text
   Processing</a> software under the GPL license, but has instead decided to
  @@ -207,8 +200,7 @@
   released as the 2.0 version and will be available sometime in June or
   July.
   </p>
  -                                
  -                <p>
  +                                                <p>
   The current Regexp product will continue to be supported and will provide
   a light weight alternative to the OROMatcher software. Eventually, the two
   products may be integrated together, but that is up to the community to
  @@ -218,36 +210,26 @@
   complaint about Java is the lack of text processing tools like Perl and
   other languages have.
   </p>
  -                                
  -                <hr noshade="" size="1" />
  -                                
  -                <h3>5-14-00 - Apache Jakarta Regexp 1.1 Released</h3>
  -                                
  -                <p>We are proud to announce the release of the <a href="/regexp/index.html">Apache Jakarta Regexp</a>,
  +                                                <hr noshade="" size="1" />
  +                                                <h3>5-14-00 - Apache Jakarta Regexp 1.1 Released</h3>
  +                                                <p>We are proud to announce the release of the <a href="/regexp/index.html">Apache Jakarta Regexp</a>,
   version 1.1.
   </p>
  -                                
  -                <hr noshade="" size="1" />
  -                                
  -                <h3>Apache Jakarta Regexp 1.0 Released</h3>
  -                                
  -                <p>We are proud to announce the release of the <a href="/regexp/index.html">Apache Jakarta Regexp Package</a>,  
  +                                                <hr noshade="" size="1" />
  +                                                <h3>Apache Jakarta Regexp 1.0 Released</h3>
  +                                                <p>We are proud to announce the release of the <a href="/regexp/index.html">Apache Jakarta Regexp Package</a>,  
   100% Java Regular Expression package available for download and use.
   </p>
  -                                
  -                <hr noshade="" size="1" />
  -                                
  -                <h3>
  +                                                <hr noshade="" size="1" />
  +                                                <h3>
   Tomcat Status: <a href="/builds/tomcat/release/v3.1/">3.1 Final</a> 
   Released
   </h3>
  -                                
  -                <p>
  +                                                <p>
   As compared to the 3.0 final release, this drop contains a significant number 
   of new features including:
   </p>
  -                                
  -                <ul>
  +                                                <ul>
    <li>Thread pooling and JVM load balancing</li>
    <li>ISAPI and NSAPI integration</li>
    <li>A Command line JSP to Servlet Code tool</li>
  @@ -264,23 +246,18 @@
    <li>Greater platform / JVM level coverage</li>
    <li>Many, many bugs were fixed.</li>
   </ul>
  -                                
  -                <p>
  +                                                <p>
   You can download either the <a href="/builds/tomcat/release/v3.1/bin/">binaries</a>
   or the <a href="/builds/tomcat/release/v3.1/src/">sources</a>.
   </p>
  -                                
  -                <p>As always, please submit any bugs you might find at <a href="./bugs.html">the Jakarta bugs page</a>.
  +                                                <p>As always, please submit any bugs you might find at <a href="./bugs.html">the Jakarta bugs page</a>.
   See the <a href="./mail.html">Mailing Lists</a> page for 
   subscription information.</p>
  -                                
  -                <hr noshade="" size="1" />
  -                                
  -                <h3>
  +                                                <hr noshade="" size="1" />
  +                                                <h3>
   New Subproject:  Jakarta Taglibs
   </h3>
  -                                
  -                <p>A new subproject has been started called <b>jakarta-taglibs</b> to serve as
  +                                                <p>A new subproject has been started called <b>jakarta-taglibs</b> to serve as
   a repository for JSP custom tag libraries contributed to Jakarta under the
   Apache Source License.  Developers may use these custom tag libraries in their
   own web applications, or to learn more about building your own custom tags.
  @@ -289,22 +266,18 @@
   will be available.  See the <a href="./binindex.html">Binaries</a>
   and <a href="./sourceindex.html">Source Code</a> download pages
   for more information.</p>
  -                                
  -                <p>Two new mailing lists have been created to support this effort.  The
  +                                                <p>Two new mailing lists have been created to support this effort.  The
   <b>taglibs-user</b> list is for web application developers that are using
   these custom tag libraries in your applications, while the <b>taglibs-dev</b>
   list is for developers interested in contributing new custom libraries, or
   offering enhancements and bug fixes to the existing libraries.  See the
   <a href="./mail.html">Mailing Lists</a> page for subscription
   information.</p>
  -                                
  -                <hr noshade="" size="1" />
  -                                
  -                <h3>
  +                                                <hr noshade="" size="1" />
  +                                                <h3>
   New mailing list: <b>tomcat-user@jakarta.apache.org</b> created
   </h3>
  -                                
  -                <p>
  +                                                <p>
   In order to better organize discussions, we now have a new mailing
   list called <b>tomcat-user</b> for discussions germane to people
   actually using or experimenting with Tomcat. In the past all
  @@ -313,18 +286,14 @@
   plans and other issues which are of relevance to Tomcat developers;
   <b>tomcat-user</b> will be the standard forum for support on Tomcat.
   </p>
  -                                
  -                <p>
  +                                                <p>
   To subscribe, send mail to <a href="mailto:tomcat-user-subscribe@jakarta.apache.org">tomcat-user-subscribe@jakarta.apache.org</a>.
   </p>
  -                                
  -                <hr noshade="" size="1" />
  -                                
  -                <h3>
  +                                                <hr noshade="" size="1" />
  +                                                <h3>
   Bug Database and Mailing List Archive Now Available
   </h3>
  -                                
  -                <p>
  +                                                <p>
   Thanks to Pier Fumagalli, we now have a Bugzilla 
   <a href="./bugs.html">bug database</a> set up for the Jakarta project.
   And thanks to Bill Middleton, the Tomcat developers mailing list is
  @@ -332,45 +301,36 @@
   Please look at these two sources, plus the FAQ, before posting new
   questions or reporting bugs on the mailing lists.
   </p>
  -                                
  -                <p>
  +                                                <p>
   To learn more about participating in the development efforts on the
   future releases of Tomcat, <a href="./getinvolved.html">click here</a>.
   </p>
  -                                
  -                <hr noshade="" size="1" />
  -                                
  -                <h3>
  +                                                <hr noshade="" size="1" />
  +                                                <h3>
   In the News
   </h3>
  -                                
  -                <p>
  +                                                <p>
   <b><a href="http://community.borland.com/article/0,1410,22057,00.html">
   Apache Tomcat Servlet and JavaServer Pages Development with JBuilder Foundation</a></b>
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b><a href="http://www7.software.ibm.com/vad.nsf/Data/Document2390?OpenDocument">
   Apache Tomcat 3.1 Final Release Servlet and JSP Development with VisualAge for Java </a></b>
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b><a href="http://news.cnet.com/news/0-1003-200-344386.html">
   Open-source Apache project solidifies status </a></b>
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b><a href="http://java.sun.com/pr/1999/06/pr990615-19.html"> Sun to
   License JavaServer Pages Technology to Apache Developer
   Community</a></b>
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b><a href="http://java.sun.com/pr/1999/06/pr990602-01.html"> Sun
   Unveils JavaServer Pages Technology</a></b>
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b><a href="http://www.wired.com/news/news/technology/story/20237.html">
   Sun Aligns with Palm and Apache</a></b>
   </p>
  
  
  
  1.6       +26 -52    jakarta-site2/docs/site/roles.html
  
  Index: roles.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/roles.html,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- roles.html	2000/12/11 03:11:50	1.5
  +++ roles.html	2000/12/13 00:02:07	1.6
  @@ -19,8 +19,7 @@
               <table border="0" width="100%" cellspacing="0">
                   <!-- TOP IMAGE -->
                   <tr>
  -                    
  -<td colspan="2">
  +                    <td colspan="2">
   <a href="http://jakarta.apache.org"><img src="http://jakarta.apache.org/images/jakarta-logo.gif" align="left" border="0"/></a>
   </td>
                   </tr>
  @@ -35,8 +34,7 @@
                       <td valign="top" nowrap="true">
                                   <strong>Essentials</strong>
           <ul>
  -                    <li>
  -    <a href="../index.html">Front Page</a>
  +                    <li>    <a href="../index.html">Front Page</a>
   </li>
                       <li>    <a href="http://jakarta.apache.org/site/news.html">News & Status</a>
   </li>
  @@ -69,35 +67,25 @@
                   </ul>
               <strong>SubProjects</strong>
           <ul>
  -                    <li>
  -    <a href="../ant/index.html">Ant</a>
  +                    <li>    <a href="../ant/index.html">Ant</a>
   </li>
  -                    <li>
  -    <a href="../ecs/index.html">ECS</a>
  +                    <li>    <a href="../ecs/index.html">ECS</a>
   </li>
  -                    <li>
  -    <a href="../oro/index.html">ORO</a>
  +                    <li>    <a href="../oro/index.html">ORO</a>
   </li>
  -                    <li>
  -    <a href="../regexp/index.html">Regexp</a>
  +                    <li>    <a href="../regexp/index.html">Regexp</a>
   </li>
  -                    <li>
  -    <a href="../slide/index.html">Slide</a>
  +                    <li>    <a href="../slide/index.html">Slide</a>
   </li>
  -                    <li>
  -    <a href="../struts/index.html">Struts</a>
  +                    <li>    <a href="../struts/index.html">Struts</a>
   </li>
  -                    <li>
  -    <a href="../taglibs/index.html">Taglibs</a>
  +                    <li>    <a href="../taglibs/index.html">Taglibs</a>
   </li>
  -                    <li>
  -    <a href="../tomcat/index.html">Tomcat</a>
  +                    <li>    <a href="../tomcat/index.html">Tomcat</a>
   </li>
  -                    <li>
  -    <a href="../velocity/index.html">Velocity</a>
  +                    <li>    <a href="../velocity/index.html">Velocity</a>
   </li>
  -                    <li>
  -    <a href="../watchdog/index.html">Watchdog</a>
  +                    <li>    <a href="../watchdog/index.html">Watchdog</a>
   </li>
                   </ul>
               <strong>Misc</strong>
  @@ -123,50 +111,41 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
     The roles and responsibilities that people can assume in the project 
     are based on merit. Everybody can help no matter what their role. 
     Those who have been long term or valuable contributors to the project 
     obtain the right to vote and commit directly to the source repository.
     </p>
  -                                
  -                <h2>Users</h2>
  -                                
  -                <p>
  +                                                <h2>Users</h2>
  +                                                <p>
     Users are the people who use the products of the Project. People in
     this role aren't contributing code, but they are using the products,
     reporting bugs, making feature requests, and such. This is by far
     the most important category of people as, without users, there is no
     reason for the Project.
     </p>
  -                                
  -                <p>
  +                                                <p>
     When a user starts to contribute code or documentation patches, they
     become a developer.
     </p>
  -                                
  -                <h2>Developers</h2>
  -                                
  -                <p>
  +                                                <h2>Developers</h2>
  +                                                <p>
     Developers are the people who write code or documentation patches or
     contribute positively to the project in other ways. A developer's
     contribution is always recognized. In source code, all developers
     who contribute to a source file may add their name to the list of
     authors for that file.
     </p>
  -                                
  -                <h2>Committers</h2>
  -                                
  -                <p>
  +                                                <h2>Committers</h2>
  +                                                <p>
     Developers who give frequent and valuable contributions to a
     subproject of the Project can have their status promoted to that of
     a "<em>Committer</em>" for that subproject. A Committer
     has write access to the source code repository and gains voting
     rights allowing them to affect the future of the subproject.
     </p>
  -                                
  -                <p>
  +                                                <p>
     In order for a Developer to become a Committer, another Committer
     can nominate that Developer or the Developer can ask for it. Once a
     Developer is nominated, all of the Committers for a subproject will
  @@ -174,18 +153,15 @@
     the Developer is converted into a Committer and given write access 
     to the source code repository for that subproject.
     </p>
  -                                
  -                <p>
  +                                                <p>
     At times, Committers may go inactive for a variety of reasons. A
     Committer that has been inactive for 6 months or more may lose his
     or her status as a Committer.
     </p>
  -                                
  -                <p>
  +                                                <p>
     A list of our current Committers can be found in our <a href="./whoweare.html">Project Credits</a>.
     </p>
  -                                
  -                <p>
  +                                                <p>
     <h2>Project Management Committee (PMC)</h2>
     Committers who frequently participate with valuable contributions may
     have their status promoted to that of a "<em>Project Management
  @@ -195,12 +171,10 @@
     the PMC must nominate the Committer. The individual may then be
     approved with a 3/4 majority of the PMC.
     </p>
  -                                
  -                <p>
  +                                                <p>
     To view the Project Management Committee bylaws, <a href="management.html">
     click here</a>.</p>
  -                                
  -                <p>
  +                                                <p>
     A list of our current PMC Members can be found in our <a href="./whoweare.html">Project Credits</a>.
     </p>
                               </blockquote>
  
  
  
  1.6       +34 -68    jakarta-site2/docs/site/source.html
  
  Index: source.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/source.html,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- source.html	2000/12/11 03:11:50	1.5
  +++ source.html	2000/12/13 00:02:07	1.6
  @@ -19,8 +19,7 @@
               <table border="0" width="100%" cellspacing="0">
                   <!-- TOP IMAGE -->
                   <tr>
  -                    
  -<td colspan="2">
  +                    <td colspan="2">
   <a href="http://jakarta.apache.org"><img src="http://jakarta.apache.org/images/jakarta-logo.gif" align="left" border="0"/></a>
   </td>
                   </tr>
  @@ -35,8 +34,7 @@
                       <td valign="top" nowrap="true">
                                   <strong>Essentials</strong>
           <ul>
  -                    <li>
  -    <a href="../index.html">Front Page</a>
  +                    <li>    <a href="../index.html">Front Page</a>
   </li>
                       <li>    <a href="http://jakarta.apache.org/site/news.html">News & Status</a>
   </li>
  @@ -69,35 +67,25 @@
                   </ul>
               <strong>SubProjects</strong>
           <ul>
  -                    <li>
  -    <a href="../ant/index.html">Ant</a>
  +                    <li>    <a href="../ant/index.html">Ant</a>
   </li>
  -                    <li>
  -    <a href="../ecs/index.html">ECS</a>
  +                    <li>    <a href="../ecs/index.html">ECS</a>
   </li>
  -                    <li>
  -    <a href="../oro/index.html">ORO</a>
  +                    <li>    <a href="../oro/index.html">ORO</a>
   </li>
  -                    <li>
  -    <a href="../regexp/index.html">Regexp</a>
  +                    <li>    <a href="../regexp/index.html">Regexp</a>
   </li>
  -                    <li>
  -    <a href="../slide/index.html">Slide</a>
  +                    <li>    <a href="../slide/index.html">Slide</a>
   </li>
  -                    <li>
  -    <a href="../struts/index.html">Struts</a>
  +                    <li>    <a href="../struts/index.html">Struts</a>
   </li>
  -                    <li>
  -    <a href="../taglibs/index.html">Taglibs</a>
  +                    <li>    <a href="../taglibs/index.html">Taglibs</a>
   </li>
  -                    <li>
  -    <a href="../tomcat/index.html">Tomcat</a>
  +                    <li>    <a href="../tomcat/index.html">Tomcat</a>
   </li>
  -                    <li>
  -    <a href="../velocity/index.html">Velocity</a>
  +                    <li>    <a href="../velocity/index.html">Velocity</a>
   </li>
  -                    <li>
  -    <a href="../watchdog/index.html">Watchdog</a>
  +                    <li>    <a href="../watchdog/index.html">Watchdog</a>
   </li>
                   </ul>
               <strong>Misc</strong>
  @@ -123,32 +111,26 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
     The Project's codebase is maintained in shared information
     repositories using CVS on the dev.apache.org machine. Only
     Committers have write access to these repositories. Everyone has
     read access via anonymous CVS.
     </p>
  -                                
  -                <p>
  +                                                <p>
     All Java Language source code in the repository must be written in
     conformance to the "<a href="http://java.sun.com/docs/codeconv/html/CodeConvTOC.doc.html">Code
   Conventions for the Java Programming Language</a> as published by Sun.
     </p>
  -                                
  -                <h2>License</h2>
  -                                
  -                <p>
  +                                                <h2>License</h2>
  +                                                <p>
     All source code committed to the Project's repositories must be
     covered by the <a href="../LICENSE">Apache License</a> or contain a
     copyright and license that allows redistribution under the same
     conditions as the Apache License.
     </p>
  -                                
  -                <h2>Status Files</h2>
  -                                
  -                <p>
  +                                                <h2>Status Files</h2>
  +                                                <p>
     Each of the Project's active source code repositories contain a file
     named <span class="code">STATUS</span> which is used to keep track
     of the agenda and plans for work within that repository. The status
  @@ -158,45 +140,37 @@
     developers are working on or want discussion about, and anything
     else that may be useful to help the group track progress.
     </p>
  -                                
  -                <p>
  +                                                <p>
     The active status files are automatically posted to the developer
     mailing lists three times per week.
     </p>
  -                                
  -                <h2>Branches</h2>
  -                                
  -                <p>
  +                                                <h2>Branches</h2>
  +                                                <p>
     Groups are allowed to create a branch for release cycles, etc. They
     are expected to merge completely back with the main branch as soon
     as their release cycle is complete.
     </p>
  -                                
  -                <h2>Changes</h2>
  -                                
  -                <p>
  +                                                <h2>Changes</h2>
  +                                                <p>
     Simple patches to fix bugs can be committed then reviewed. With a
     commit-then-review process, the Committer is trusted to have a high
     degree of confidence in the change.
     </p>
  -                                
  -                <p>
  +                                                <p>
     Doubtful changes, new features, and large scale overhauls need to be
     discussed before committing them into the repository. Any change
     that affects the semantics of an existing API function, the size of
     the program, configuration data formats, or other major areas must
     receive consensus approval before being committed.
     </p>
  -                                
  -                <p>
  +                                                <p>
     Related changes should be committed as a group, or very closely
     together. Half complete projects should never be committed to the
     main branch of a development repository. All code changes must be
     successfully compiled on the developer's platform before being
     committed.
     </p>
  -                                
  -                <p>
  +                                                <p>
     The current source code tree for a subproject should be capable of
     complete compilation at all times. However, it is sometimes
     impossible for a developer on one platform to avoid breaking some
  @@ -204,18 +178,15 @@
     a given change will break the build on some other platform, the
     committer must indicate that in the commit message.
     </p>
  -                                
  -                <p>
  +                                                <p>
     A committed change must be reversed if it is vetoed by one of the
     voting members and the veto conditions cannot be immediately
     satisfied by the equivalent of a "bug fix" commit. The
     veto must be rescinded before the change can be included in any
     public release.
     </p>
  -                                
  -                <h2>Patches</h2>
  -                                
  -                <p>
  +                                                <h2>Patches</h2>
  +                                                <p>
     When a specific change to a product is proposed for discussion or
     voting on the appropriate development mailing list, it should be
     presented in the form of input to the patch command. When sent to
  @@ -223,8 +194,7 @@
     with <span class="code">[PATCH]</span> and a distinctive one-line
     summary corresponding to the action item for that patch.
     </p>
  -                                
  -                <p>
  +                                                <p>
     The patch should be created by using the <span class="code">diff
     -u</span> command from the original software file(s) to the modified
     software file(s). For example:
  @@ -250,8 +220,7 @@
       </tr>
       </table>
       </div>
  -                                
  -                <p>or</p>
  +                                                <p>or</p>
                                                       <div align="left">
       <table cellspacing="4" cellpadding="0" border="0">
       <tr>
  @@ -273,18 +242,15 @@
       </tr>
       </table>
       </div>
  -                                
  -                <p>or (Win32)</p>
  -                                
  -                <p>
  +                                                <p>or (Win32)</p>
  +                                                <p>
     You can use <a href="http://www.wincvs.org/">WinCVS</a> for a nice GUI or
     you can install <a href="http://sources.redhat.com/cygwin/">Cygwin</a> which
     will enable you to use the bash shell and also installs a lot of other
     utilities (such as diff and patch) that will turn your PC into a virtual
     Unix machine.
     </p>
  -                                
  -                <p>
  +                                                <p>
     All patches necessary to address an action item should be
     concatencated within a single patch message. If later modification
     to the patch proves necessary, the entire new patch should be posted
  
  
  
  1.8       +4 -2      jakarta-site2/docs/site/sourceindex.html
  
  Index: sourceindex.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/sourceindex.html,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- sourceindex.html	2000/12/12 17:48:07	1.7
  +++ sourceindex.html	2000/12/13 00:02:07	1.8
  @@ -157,8 +157,10 @@
   Release Builds
   </h2>
                                                   <ul>
  -<li><a href="/builds/tomcat/release/v3.2/src/">Tomcat
  -3.2</a> is the latest release quality Tomcat build.</li>
  +<li><a href="/builds/tomcat/release/v3.1.1/src/">Tomcat
  +3.1.1</a> is a maintenance release of Tomcat 3.1.</li>
  +<li><a href="/builds/tomcat/release/v3.2.1/src/">Tomcat
  +3.2.1</a> is the latest release quality Tomcat build.</li>
   <li><a href="/builds/ant/release/v1.2/src/">Ant
   1.2</a> is the latest release of the Ant Subproject.</li>
   </ul>
  
  
  
  1.6       +35 -70    jakarta-site2/docs/site/whoweare.html
  
  Index: whoweare.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/whoweare.html,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- whoweare.html	2000/12/11 03:11:50	1.5
  +++ whoweare.html	2000/12/13 00:02:07	1.6
  @@ -19,8 +19,7 @@
               <table border="0" width="100%" cellspacing="0">
                   <!-- TOP IMAGE -->
                   <tr>
  -                    
  -<td colspan="2">
  +                    <td colspan="2">
   <a href="http://jakarta.apache.org"><img src="http://jakarta.apache.org/images/jakarta-logo.gif" align="left" border="0"/></a>
   </td>
                   </tr>
  @@ -35,8 +34,7 @@
                       <td valign="top" nowrap="true">
                                   <strong>Essentials</strong>
           <ul>
  -                    <li>
  -    <a href="../index.html">Front Page</a>
  +                    <li>    <a href="../index.html">Front Page</a>
   </li>
                       <li>    <a href="http://jakarta.apache.org/site/news.html">News & Status</a>
   </li>
  @@ -69,35 +67,25 @@
                   </ul>
               <strong>SubProjects</strong>
           <ul>
  -                    <li>
  -    <a href="../ant/index.html">Ant</a>
  +                    <li>    <a href="../ant/index.html">Ant</a>
   </li>
  -                    <li>
  -    <a href="../ecs/index.html">ECS</a>
  +                    <li>    <a href="../ecs/index.html">ECS</a>
   </li>
  -                    <li>
  -    <a href="../oro/index.html">ORO</a>
  +                    <li>    <a href="../oro/index.html">ORO</a>
   </li>
  -                    <li>
  -    <a href="../regexp/index.html">Regexp</a>
  +                    <li>    <a href="../regexp/index.html">Regexp</a>
   </li>
  -                    <li>
  -    <a href="../slide/index.html">Slide</a>
  +                    <li>    <a href="../slide/index.html">Slide</a>
   </li>
  -                    <li>
  -    <a href="../struts/index.html">Struts</a>
  +                    <li>    <a href="../struts/index.html">Struts</a>
   </li>
  -                    <li>
  -    <a href="../taglibs/index.html">Taglibs</a>
  +                    <li>    <a href="../taglibs/index.html">Taglibs</a>
   </li>
  -                    <li>
  -    <a href="../tomcat/index.html">Tomcat</a>
  +                    <li>    <a href="../tomcat/index.html">Tomcat</a>
   </li>
  -                    <li>
  -    <a href="../velocity/index.html">Velocity</a>
  +                    <li>    <a href="../velocity/index.html">Velocity</a>
   </li>
  -                    <li>
  -    <a href="../watchdog/index.html">Watchdog</a>
  +                    <li>    <a href="../watchdog/index.html">Watchdog</a>
   </li>
                   </ul>
               <strong>Misc</strong>
  @@ -123,8 +111,7 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
   The Jakarta Project operates on a meritocracy: the more you do, the
   more responsibility you will obtain. This page lists all of the people
   who have gone the extra mile and are Committers or members of the
  @@ -132,8 +119,7 @@
   first step is to join the <a href="./mail.html">mailing
   lists</a>.
   </p>
  -                                
  -                <p>
  +                                                <p>
   We ask that you please do not send us emails privately asking for support. We
   are non-paid volunteers who help out with the project and we do not
   necessarily have the time or energy to help people on an individual
  @@ -154,38 +140,33 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
   <b>Hans Bergsten</b><br /> <a href="mailto:hans@gefionsoftware.com">hans@gefionsoftware.com</a><br />
   Hans is a member of the Servlet and JSP specification working groups
   and writes articles and books about these technologies. He's also the
   founder and president of Gefion software, a company that develops
   servlet and JSP based products and customer solutions.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b>James Duncan Davidson</b><br />
   <a href="mailto:duncan@x180.com">duncan@x180.com</a><br /> James a rabble
   rouser that helped convince Sun that it was a "Good Thing(tm)" to
   support the Jakarta Project with code and engineers. During the day,
   he is responsible for the Servlet API. He is the Chairman of the PMC.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b>Pierpaolo Fumagalli</b><br /> <a href="mailto:pier@betaversion.org">pier@betaversion.org</a><br /> Pier
   is an open source developer who got involved with the Apache JServ
   project a few years ago. Since august 2000 he works for Sun Microsystems.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b>Craig McClanahan</b><br /> <a href="mailto:Craig.McClanahan@eng.sun.com">Craig.McClanahan@eng.sun.com</a><br />
   Craig was involved in the Apache JServ project, focused on implementing
   a next generation architecture and feature set for the core servlet
   engine.  He has recently joined Sun as technical lead for the servlet
   and JSP reference implementation.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b>Sam Ruby</b><br /> <a href="mailto:rubys@us.ibm.com">rubys@us.ibm.com</a><br /> Sam Ruby's main
   interests are in integrating Java with scripting languages.  His other current
   projects include <a href="http://www.alphaworks.ibm.com/tech/bsf">BSF</a>, and 
  @@ -193,8 +174,7 @@
   recently assumed the role of project editor for the ECMA TC39 (ECMAScript) 
   committee.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b>Jon S. Stevens</b><br /> <a href="mailto:jon@collab.net">jon@collab.net</a><br /> Jon is a
   Co-Founder of <a href="http://www.clearink.com/">Clear Ink Corp</a> and recently 
   left to work on <a href="http://scarab.tigris.org/">Scarab</a> a next 
  @@ -203,8 +183,7 @@
   Apache Web Server and Co-Author of the <a href="http://java.apache.org/ecs/">Element Construction Set</a> as well as the 
   web application framework, <a href="http://java.apache.org/turbine/">Turbine</a>.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b>Anil Vijendran</b><br /> <a href="mailto:akv@eng.sun.com">akv@eng.sun.com</a><br /> Anil Vijendran
   is the principal developer of the JSP engine in Tomcat. He's done some
   pretty scary things in his past life -- implementing the CORBA IDL to
  @@ -223,8 +202,7 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
   <b>Brian Behlendorf</b><br />
   <a href="mailto:brian@behlendorf.com">brian@behlendorf.com</a><br /> Brian is a
   co-founder of the Apache html HTTP Server Project. He is CTO and co-founder
  @@ -241,16 +219,14 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                    
  -                <p>
  +                                    <p>
   <b><a href="http://relativity.yi.org">Kevin Burton</a></b><br />
   <a href="mailto:burton@relativity.yi.org">burton@relativity.yi.org</a><br />
   Kevin is an Open Source developer who is involved in many projects
   including Jakarta, Apache JetSpeed/Turbine, and jEdit.  When he is not
   hacking on code he can be found sleeping. 
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b><a href="http://www.stinky.com/alex/">Alexander Day Chaffee</a></b><br />
   <a href="mailto:alex@jguru.com">alex@jguru.com</a><br />
   Alex runs the 
  @@ -260,8 +236,7 @@
   at <a href="http://www.jguru.com/">jGuru.com</a>. He's also developed lots of open source code, avaliable at his
   <a href="http://www.purpletech.com/">Purple Technology</a> site. In a past life, he created and ran <a href="http://www.gamelan.com">Gamelan</a> for <a href="http://www.earthweb.com">EarthWeb</a>.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b>Danno Ferrin</b><br />
   <a href="mailto:shemnon@earthlink.net">shemnon@earthlink.net</a><br />
   Danno has been programming in Java since Summer 96. Danno wrote a JSP
  @@ -269,54 +244,47 @@
   announced at JavaOne. Since then, he decided to join the Jakarta
   project in a spirit of co-operation over competition.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b>Jason Hunter</b><br /> 
   <a href="mailto:jh@servlets.com">jh@servlets.com</a><br /> Jason is author of 
   "Java Servlet Programming" (O'Reilly) and publisher of <a href="http://www.servlets.com/">http://www.servlets.com/</a>.  He works at
   <a href="http://www.collab.net">CollabNet</a>.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b>Petr Jiricka</b><br />
   <a href="mailto:petr.jiricka@netbeans.com">petr.jiricka@netbeans.com</a><br />
   Petr is an engineer with the development tools group at Sun Microsystems. He
   is responsible for the support of JSPs and servlets in Forte for Java /
   NetBeans tools suite and their integration with Tomcat.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b>Ramesh Mandava</b><br />
   <a href="mailto:rmandava@talentportal.com">rmandava@talentportal.com</a><br />
   Ramesh.Mandava is a team member of the JSP and Servlet group at Sun
   Microsystems. He is presently responsible to make sure that Jakarta
   is a high quality product.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b>Stefano Mazzocchi</b><br />
   <a href="mailto:stefano@apache.org">stefano@apache.org</a><br />
   Stefano is a college student addicted to Java programming and open development. He is the author of
   the Cocoon Publishing Framework and an active contributor of many other projects hosted under the
   Apache umbrella.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b>Rajiv Mordani</b><br />
   <a href="mailto:mode@chinet.com">mode@chinet.com</a><br />
   Works on the XMl parser reference implementation team at Sun and the Jakarta 
   Project.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b>Ignacio J. Ortega</b><br />
   <a href="mailto:nacho@siapi.es">nacho@siapi.es</a><br />
   Ignacio "Nacho" Ortega, he is mainly responsible of any bug you can found 
   inside JDBCRealm, and the Spanish Translation of Tomcat 3.X and 4.0 (soon), 
   and many bug fixes.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b>Harish Prabhandham</b><br />
   <a href="mailto:harishp@onebox.com">harishp@onebox.com</a><br />
   Harish is an engineer with the J2EE team at Sun, primarily responsible
  @@ -325,13 +293,11 @@
   implementations from Tomcat into the J2EE RI. These days, he hacks PHP
   code during the day. 
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b>Jean-Luc Rochat</b><br />
   <a href="mailto:jnix@cybercable.fr">jnix@cybercable.fr</a><br />
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b>Gal Shachor</b><br />
   <a href="mailto:shachor@il.ibm.com">shachor@il.ibm.com</a><br />
   Gal Shachor is a research staff member at IBM. He wrote his first
  @@ -339,8 +305,7 @@
   ServletExpress (and Gal) merged into WebSphere, and Gal participated
   in the development of WebSphere 1, 2 and 3.
   </p>
  -                                
  -                <p>
  +                                                <p>
   <b>James Todd</b><br />
   <a href="mailto:jwtodd@pacbell.net">jwtodd@pacbell.net</a><br />
   James has developed real time customer oriented apps for roughly 10
  
  
  
  1.3       +4 -2      jakarta-site2/xdocs/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/xdocs/index.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- index.xml	2000/11/30 21:59:04	1.2
  +++ index.xml	2000/12/13 00:02:11	1.3
  @@ -59,8 +59,10 @@
               Java Servlet 2.2 and JavaServer Pages 1.1 Specifications. This
               implementation will be used in the Apache Web Server as well as in
               other web servers and development tools.
  -            <strong>NOW AVAILABLE:
  -            <a href="/builds/tomcat/release/v3.2/bin/">Tomcat 3.2 (final)</a>
  +            <strong><font color="red">NOW AVAILABLE:</font>
  +            Security-fix updates for
  +            <a href="/builds/tomcat/release/v3.1.1/bin/">Tomcat 3.1.1</a> and
  +            <a href="/builds/tomcat/release/v3.2.1/bin/">Tomcat 3.2.1</a>
               </strong>
           </p>
       </td>
  
  
  
  1.6       +2 -1      jakarta-site2/xdocs/site/binindex.xml
  
  Index: binindex.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/xdocs/site/binindex.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- binindex.xml	2000/12/11 03:15:12	1.5
  +++ binindex.xml	2000/12/13 00:02:11	1.6
  @@ -63,7 +63,8 @@
   <li><a href="/builds/jakarta-ecs/release/v1.3.3/">ECS 1.3.3</a></li>
   <li><a href="/builds/jakarta-oro/release/v2.0.1/">ORO 2.0.1</a></li>
   <li><a href="/builds/jakarta-regexp/release/v1.2/">Regexp 1.2</a></li>
  -<li><a href="/builds/jakarta-tomcat/release/v3.2/bin/">Tomcat 3.2</a></li>
  +<li><a href="/builds/jakarta-tomcat/release/v3.1.1/bin/">Tomcat 3.1.1</a></li>
  +<li><a href="/builds/jakarta-tomcat/release/v3.2.1/bin/">Tomcat 3.2.1</a></li>
   </ul>
   
   <h2>
  
  
  
  1.7       +14 -0     jakarta-site2/xdocs/site/news.xml
  
  Index: news.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/xdocs/site/news.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- news.xml	2000/11/30 04:49:38	1.6
  +++ news.xml	2000/12/13 00:02:12	1.7
  @@ -10,6 +10,20 @@
   
     <section name="News &amp; Status">
   
  +<h3>12-12-00 - Tomcat 3.1.1 and Tomcat 3.2.1 Security Fix Releases</h3>
  +
  +<p>Recently, several security vulnerabilities have been identified in both
  +Tomcat 3.1 and Tomcat 3.2.  To deal with these issues, maintenance releases
  +of each Tomcat version have been prepared:
  +<a href="http://jakarta.apache.org/builds/tomcat/release/v3.1.1/bin">Tomcat 3.1.1</a> and
  +<a href="http://jakarta.apache.org/builds/tomcat/release/v3.2.1/bin">Tomcat 3.2.1</a>.
  +Please see the file <code>doc/readme</code> in each download to read the
  +Release Notes for that version.  In each case, you will not need to modify
  +any native code components used to integrate Tomcat with a web server --
  +all of the changes affect only the Java components under the
  +<code>$TOMCAT_HOME</code> directory.</p>
  +
  +
   <h3>11-29-00 - Tomcat 3.2 Final Release Available</h3>
   
   <p>
  
  
  
  1.4       +4 -2      jakarta-site2/xdocs/site/sourceindex.xml
  
  Index: sourceindex.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/xdocs/site/sourceindex.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- sourceindex.xml	2000/12/12 17:44:15	1.3
  +++ sourceindex.xml	2000/12/13 00:02:12	1.4
  @@ -63,8 +63,10 @@
   </h2>
   
   <ul>
  -<li><a href="/builds/tomcat/release/v3.2/src/">Tomcat
  -3.2</a> is the latest release quality Tomcat build.</li>
  +<li><a href="/builds/tomcat/release/v3.1.1/src/">Tomcat
  +3.1.1</a> is a maintenance release of Tomcat 3.1.</li>
  +<li><a href="/builds/tomcat/release/v3.2.1/src/">Tomcat
  +3.2.1</a> is the latest release quality Tomcat build.</li>
   <li><a href="/builds/ant/release/v1.2/src/">Ant
   1.2</a> is the latest release of the Ant Subproject.</li>
   </ul>