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 du...@hyperreal.org on 1999/10/08 05:32:06 UTC

cvs commit: jakarta-site/mission index.html index.htsrc

duncan      99/10/07 20:32:06

  Modified:    credits  whoweare.html whoweare.htsrc
               getinvolved cvsindex.html cvsindex.htsrc
               guidelines communication.html communication.htsrc
                        decisions.html decisions.htsrc index.html
                        index.htsrc management.html management.htsrc
                        roles.html roles.htsrc source.html source.htsrc
               mission  index.html index.htsrc
  Added:       .        LICENSE
  Log:
  PMC Motivated changes
  
  Revision  Changes    Path
  1.1                  jakarta-site/LICENSE
  
  Index: LICENSE
  ===================================================================
  /* ====================================================================
   * 
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 1999 The Apache Software Foundation.  All rights 
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer. 
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowlegement:  
   *       "This product includes software developed by the 
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written 
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   *
   * [Additional notices, if required by prior licensing conditions]
   *
   */ 
  
  
  
  
  
  
  
  
  1.6       +39 -30    jakarta-site/credits/whoweare.html
  
  Index: whoweare.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site/credits/whoweare.html,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- whoweare.html	1999/10/07 23:34:43	1.5
  +++ whoweare.html	1999/10/08 03:31:54	1.6
  @@ -1,6 +1,6 @@
   <html>
   <head>
  -<!-- $Id: whoweare.html,v 1.5 1999/10/07 23:34:43 duncan Exp $ -->
  +<!-- $Id: whoweare.html,v 1.6 1999/10/08 03:31:54 duncan Exp $ -->
   <!-- Copyright 1999, Apache Software Foundation -->
   <!-- Content head element begins -->
   
  @@ -99,18 +99,20 @@
   <p>
   
   The Jakarta Project operates on a meritocracy: the more you do, the
  -more responsibility you will obtain. The people listed here (in no
  -particular order except alphabetically) are those that have already
  -gone that extra mile and who form the early core of the Project. These
  -are the folks that have set up the initial working groups for the
  -Servlet and JSP projects. We intend that all committers will be listed
  -here.  If you would like to get involved, the first step is to join
  -the <a href=../getinvolved/mail.html>mailing lists</a>.
  +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
  +Project Management Committee. If you would like to get involved, the
  +first step is to join the <a href=../getinvolved/mail.html>mailing
  +lists</a>.
  +
  +<h2>Project Management Committee:</h2>
  +
   <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 currently as
  -CTO of New Ventures at O'Reilly and Associates.
  +<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>
  @@ -123,16 +125,8 @@
   </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.
  -</p>
  -
  -<p>
  -<b>Pierpaolo Fumagalli</b><br> 
  -<a href="mailto:pier@apache.org">pier@apache.org</a><br> Pier is an open
  +<b>Pierpaolo Fumagalli</b><br> <a
  +href="mailto:pier@apache.org">pier@apache.org</a><br> Pier is an open
   source developer who got involved with the Apache JServ project a few
   years ago. He is currently working for IBM on XML technologies and (of
   course) on the Jakarta Project.
  @@ -147,19 +141,34 @@
   </p>
   
   <p>
  -<b>Craig McClanahan</b><br>
  -<a href="mailto:cmcclanahan@mytownnet.com">cmcclanahan@mytownnet.com</a><br>
  -Craig is an Information Systems Architect for DAT Services. He joined the Apache JServ project in
  -January 1999, focused on implementing a next generation architecture and feature set in the core
  -servlet engine. 
  +<b>Craig McClanahan</b><br> <a
  +href="mailto:cmcclanahan@mytownnet.com">cmcclanahan@mytownnet.com</a><br>
  +Craig is an Information Systems Architect for DAT Services. He joined
  +the Apache JServ project in January 1999, focused on implementing a
  +next generation architecture and feature set in the core servlet
  +engine.
   </p>
   
   <p>
  -<b>Jon Stevens</b><br>
  -<a href="mailto:jon@clearink.com">jon@clearink.com</a><br>
  -Jon is a Co-Founder and a Web Engineer at Clear Ink Corp. He is an active developer of the Jserv
  -Servlet Engine for the Apache Web Server and Co-Author of the Element Construction Set.
  +<b>Jon Stevens</b><br> <a
  +href="mailto:jon@clearink.com">jon@clearink.com</a><br> Jon is a
  +Co-Founder and a Web Engineer at Clear Ink Corp. He is an active
  +developer of the Jserv Servlet Engine for the Apache Web Server and
  +Co-Author of the Element Construction Set.
   </p>
  +
  +<h2>Advisors:</h2>
  +
  +<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 currently as
  +CTO of New Ventures at O'Reilly and Associates.
  +</p>
  +
  +<h2>Committers:</h2>
  +
  +<p><em>coming</em></p>
   
   
   
  
  
  
  1.6       +39 -30    jakarta-site/credits/whoweare.htsrc
  
  Index: whoweare.htsrc
  ===================================================================
  RCS file: /home/cvs/jakarta-site/credits/whoweare.htsrc,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- whoweare.htsrc	1999/10/07 23:34:44	1.5
  +++ whoweare.htsrc	1999/10/08 03:31:54	1.6
  @@ -10,18 +10,20 @@
   <p>
   
   The Jakarta Project operates on a meritocracy: the more you do, the
  -more responsibility you will obtain. The people listed here (in no
  -particular order except alphabetically) are those that have already
  -gone that extra mile and who form the early core of the Project. These
  -are the folks that have set up the initial working groups for the
  -Servlet and JSP projects. We intend that all committers will be listed
  -here.  If you would like to get involved, the first step is to join
  -the <a href=../getinvolved/mail.html>mailing lists</a>.
  +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
  +Project Management Committee. If you would like to get involved, the
  +first step is to join the <a href=../getinvolved/mail.html>mailing
  +lists</a>.
  +
  +<h2>Project Management Committee:</h2>
  +
   <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 currently as
  -CTO of New Ventures at O'Reilly and Associates.
  +<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>
  @@ -34,16 +36,8 @@
   </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.
  -</p>
  -
  -<p>
  -<b>Pierpaolo Fumagalli</b><br> 
  -<a href="mailto:pier@apache.org">pier@apache.org</a><br> Pier is an open
  +<b>Pierpaolo Fumagalli</b><br> <a
  +href="mailto:pier@apache.org">pier@apache.org</a><br> Pier is an open
   source developer who got involved with the Apache JServ project a few
   years ago. He is currently working for IBM on XML technologies and (of
   course) on the Jakarta Project.
  @@ -58,19 +52,34 @@
   </p>
   
   <p>
  -<b>Craig McClanahan</b><br>
  -<a href="mailto:cmcclanahan@mytownnet.com">cmcclanahan@mytownnet.com</a><br>
  -Craig is an Information Systems Architect for DAT Services. He joined the Apache JServ project in
  -January 1999, focused on implementing a next generation architecture and feature set in the core
  -servlet engine. 
  +<b>Craig McClanahan</b><br> <a
  +href="mailto:cmcclanahan@mytownnet.com">cmcclanahan@mytownnet.com</a><br>
  +Craig is an Information Systems Architect for DAT Services. He joined
  +the Apache JServ project in January 1999, focused on implementing a
  +next generation architecture and feature set in the core servlet
  +engine.
   </p>
   
   <p>
  -<b>Jon Stevens</b><br>
  -<a href="mailto:jon@clearink.com">jon@clearink.com</a><br>
  -Jon is a Co-Founder and a Web Engineer at Clear Ink Corp. He is an active developer of the Jserv
  -Servlet Engine for the Apache Web Server and Co-Author of the Element Construction Set.
  +<b>Jon Stevens</b><br> <a
  +href="mailto:jon@clearink.com">jon@clearink.com</a><br> Jon is a
  +Co-Founder and a Web Engineer at Clear Ink Corp. He is an active
  +developer of the Jserv Servlet Engine for the Apache Web Server and
  +Co-Author of the Element Construction Set.
   </p>
  +
  +<h2>Advisors:</h2>
  +
  +<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 currently as
  +CTO of New Ventures at O'Reilly and Associates.
  +</p>
  +
  +<h2>Committers:</h2>
  +
  +<p><em>coming</em></p>
   
   
   </body>
  
  
  
  1.4       +17 -1     jakarta-site/getinvolved/cvsindex.html
  
  Index: cvsindex.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site/getinvolved/cvsindex.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- cvsindex.html	1999/10/07 23:34:47	1.3
  +++ cvsindex.html	1999/10/08 03:31:57	1.4
  @@ -1,6 +1,6 @@
   <html>
   <head>
  -<!-- $Id: cvsindex.html,v 1.3 1999/10/07 23:34:47 duncan Exp $ -->
  +<!-- $Id: cvsindex.html,v 1.4 1999/10/08 03:31:57 duncan Exp $ -->
   <!-- Copyright 1999, Apache Software Foundation -->
   <!-- Content head element begins -->
   
  @@ -162,7 +162,23 @@
   <p>
   On Unix, CVS and SSH are freely available. Find them, compile them,
   and install them. On Windows (and other platforms), you'll need to
  -find clients that provide this functionaltiy. 
  +find clients that provide this functionalty. 
  +</p>
  +
  +<p>
  +Some frequently used Windows applications for this functionality are:
  +</p>
  +
  +<ul>
  +<li>WinCVS
  +<li>SecureCRT
  +</ul>
  +
  +</ul>
  +
  +<p>
  +An excellent guide to SSH can be found at <a
  +href="www.hyperreal.org/info/ssh">www.hyperreal.org/info/ssh</a>
   </p>
   
   <p>
  
  
  
  1.4       +17 -1     jakarta-site/getinvolved/cvsindex.htsrc
  
  Index: cvsindex.htsrc
  ===================================================================
  RCS file: /home/cvs/jakarta-site/getinvolved/cvsindex.htsrc,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- cvsindex.htsrc	1999/10/07 23:34:48	1.3
  +++ cvsindex.htsrc	1999/10/08 03:31:58	1.4
  @@ -73,7 +73,23 @@
   <p>
   On Unix, CVS and SSH are freely available. Find them, compile them,
   and install them. On Windows (and other platforms), you'll need to
  -find clients that provide this functionaltiy. 
  +find clients that provide this functionalty. 
  +</p>
  +
  +<p>
  +Some frequently used Windows applications for this functionality are:
  +</p>
  +
  +<ul>
  +<li>WinCVS
  +<li>SecureCRT
  +</ul>
  +
  +</ul>
  +
  +<p>
  +An excellent guide to SSH can be found at <a
  +href="www.hyperreal.org/info/ssh">www.hyperreal.org/info/ssh</a>
   </p>
   
   <p>
  
  
  
  1.7       +6 -1      jakarta-site/guidelines/communication.html
  
  Index: communication.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site/guidelines/communication.html,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- communication.html	1999/10/07 08:55:04	1.6
  +++ communication.html	1999/10/08 03:31:59	1.7
  @@ -1,6 +1,6 @@
   <html>
   <head>
  -<!-- $Id: communication.html,v 1.6 1999/10/07 08:55:04 duncan Exp $ -->
  +<!-- $Id: communication.html,v 1.7 1999/10/08 03:31:59 duncan Exp $ -->
   <!-- Copyright 1999, Apache Software Foundation -->
   <!-- Content head element begins -->
   
  @@ -110,6 +110,11 @@
     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>
  +  To join the mailing lists, see our <a href="../getinvolved/mail.html">
  +  Mailing List</a> page.
     </p>
   
     <p>
  
  
  
  1.4       +5 -0      jakarta-site/guidelines/communication.htsrc
  
  Index: communication.htsrc
  ===================================================================
  RCS file: /home/cvs/jakarta-site/guidelines/communication.htsrc,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- communication.htsrc	1999/10/07 08:55:04	1.3
  +++ communication.htsrc	1999/10/08 03:31:59	1.4
  @@ -24,6 +24,11 @@
     </p>
   
     <p>
  +  To join the mailing lists, see our <a href="../getinvolved/mail.html">
  +  Mailing List</a> page.
  +  </p>
  +
  +  <p>
     The Project's list fall into the following categories:
     </p>
   
  
  
  
  1.7       +4 -4      jakarta-site/guidelines/decisions.html
  
  Index: decisions.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site/guidelines/decisions.html,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- decisions.html	1999/10/07 08:55:04	1.6
  +++ decisions.html	1999/10/08 03:31:59	1.7
  @@ -1,6 +1,6 @@
   <html>
   <head>
  -<!-- $Id: decisions.html,v 1.6 1999/10/07 08:55:04 duncan Exp $ -->
  +<!-- $Id: decisions.html,v 1.7 1999/10/08 03:31:59 duncan Exp $ -->
   <!-- Copyright 1999, Apache Software Foundation -->
   <!-- Content head element begins -->
   
  @@ -107,9 +107,9 @@
     <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, the primary
  -  author of what is being changed may also cast a binding vote on that
  -  issue.
  +  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>
  
  
  
  1.4       +3 -3      jakarta-site/guidelines/decisions.htsrc
  
  Index: decisions.htsrc
  ===================================================================
  RCS file: /home/cvs/jakarta-site/guidelines/decisions.htsrc,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- decisions.htsrc	1999/10/07 08:55:04	1.3
  +++ decisions.htsrc	1999/10/08 03:31:59	1.4
  @@ -18,9 +18,9 @@
     <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, the primary
  -  author of what is being changed may also cast a binding vote on that
  -  issue.
  +  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>
  
  
  
  1.7       +2 -2      jakarta-site/guidelines/index.html
  
  Index: index.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site/guidelines/index.html,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- index.html	1999/10/07 08:55:05	1.6
  +++ index.html	1999/10/08 03:32:00	1.7
  @@ -1,6 +1,6 @@
   <html>
   <head>
  -<!-- $Id: index.html,v 1.6 1999/10/07 08:55:05 duncan Exp $ -->
  +<!-- $Id: index.html,v 1.7 1999/10/08 03:32:00 duncan Exp $ -->
   <!-- Copyright 1999, Apache Software Foundation -->
   <!-- Content head element begins -->
   
  @@ -122,7 +122,7 @@
   
     <li><a href="management.html">Project Management</a><br> <span
     class="itemdef">Defines the roles and responsibilities of the
  -  Project Management Committee.</span>
  +  Project Management Committee (PMC). </span>
   
     </ul>
       
  
  
  
  1.4       +1 -1      jakarta-site/guidelines/index.htsrc
  
  Index: index.htsrc
  ===================================================================
  RCS file: /home/cvs/jakarta-site/guidelines/index.htsrc,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- index.htsrc	1999/10/07 08:55:05	1.3
  +++ index.htsrc	1999/10/08 03:32:00	1.4
  @@ -33,7 +33,7 @@
   
     <li><a href="management.html">Project Management</a><br> <span
     class="itemdef">Defines the roles and responsibilities of the
  -  Project Management Committee.</span>
  +  Project Management Committee (PMC). </span>
   
     </ul>
       
  
  
  
  1.8       +31 -30    jakarta-site/guidelines/management.html
  
  Index: management.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site/guidelines/management.html,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- management.html	1999/10/07 08:55:05	1.7
  +++ management.html	1999/10/08 03:32:00	1.8
  @@ -1,6 +1,6 @@
   <html>
   <head>
  -<!-- $Id: management.html,v 1.7 1999/10/07 08:55:05 duncan Exp $ -->
  +<!-- $Id: management.html,v 1.8 1999/10/08 03:32:00 duncan Exp $ -->
   <!-- Copyright 1999, Apache Software Foundation -->
   <!-- Content head element begins -->
   
  @@ -94,53 +94,54 @@
   
   
   
  -  <h1>Project Mangement Committee Bylaws</h1>
  +<h1>Project Management Committee Bylaws</h1>
   
   <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 year. There is no term limit for members.
  +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
  +year. There is no term limit for members. The list of current members
  +can be found in our <a href="../credits/whoweare.html"> Project
  +Credits</a>.
   </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 may not necessarily
  -participate in the day-to-day coding but is involved in the overall development
  -plans, the alleviation of any bottlenecks, the resolution of conflicts, and 
  -the overall technical success of the project.
  +<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
  +may not necessarily participate in the day-to-day coding but is
  +involved in the overall development plans, the alleviation of any
  +bottlenecks, the resolution of conflicts, and the overall technical
  +success of the project.
  +</p>
   
   <p>
  -The PMC is answerable to the Apache Board with its Chairman serving as  
  +The PMC is answerable to the Apache Board with its Chairman serving as
   primary liaison.
   </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 via other means deemed effective by the PMC. 
  -
  -The PMC has an annual meeting at which time a new Chairman is elected. The old
  -Chairman maintains membership status. 
  +<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
  +via other means deemed effective by the PMC. The PMC has an annual
  +meeting at which time a new Chairman is elected. The old Chairman
  +maintains membership status.
   </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.
  +<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>
  -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.
  +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>
  -
   
   
   
  
  
  
  1.4       +30 -29    jakarta-site/guidelines/management.htsrc
  
  Index: management.htsrc
  ===================================================================
  RCS file: /home/cvs/jakarta-site/guidelines/management.htsrc,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- management.htsrc	1999/10/07 00:27:21	1.3
  +++ management.htsrc	1999/10/08 03:32:01	1.4
  @@ -5,53 +5,54 @@
   </head>
   <body>
   
  -  <h1>Project Mangement Committee Bylaws</h1>
  +<h1>Project Management Committee Bylaws</h1>
   
   <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 year. There is no term limit for members.
  +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
  +year. There is no term limit for members. The list of current members
  +can be found in our <a href="../credits/whoweare.html"> Project
  +Credits</a>.
   </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 may not necessarily
  -participate in the day-to-day coding but is involved in the overall development
  -plans, the alleviation of any bottlenecks, the resolution of conflicts, and 
  -the overall technical success of the project.
  +<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
  +may not necessarily participate in the day-to-day coding but is
  +involved in the overall development plans, the alleviation of any
  +bottlenecks, the resolution of conflicts, and the overall technical
  +success of the project.
  +</p>
   
   <p>
  -The PMC is answerable to the Apache Board with its Chairman serving as  
  +The PMC is answerable to the Apache Board with its Chairman serving as
   primary liaison.
   </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 via other means deemed effective by the PMC. 
  -
  -The PMC has an annual meeting at which time a new Chairman is elected. The old
  -Chairman maintains membership status. 
  +<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
  +via other means deemed effective by the PMC. The PMC has an annual
  +meeting at which time a new Chairman is elected. The old Chairman
  +maintains membership status.
   </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.
  +<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>
  -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.
  +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>
  -
   
   </body>
   </html>
  
  
  
  1.8       +11 -6     jakarta-site/guidelines/roles.html
  
  Index: roles.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site/guidelines/roles.html,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- roles.html	1999/10/07 08:55:05	1.7
  +++ roles.html	1999/10/08 03:32:01	1.8
  @@ -1,6 +1,6 @@
   <html>
   <head>
  -<!-- $Id: roles.html,v 1.7 1999/10/07 08:55:05 duncan Exp $ -->
  +<!-- $Id: roles.html,v 1.8 1999/10/08 03:32:01 duncan Exp $ -->
   <!-- Copyright 1999, Apache Software Foundation -->
   <!-- Content head element begins -->
   
  @@ -103,11 +103,6 @@
     obtain the right to vote and commit directly to the source repository.
     </p>
   
  -  <p>
  -  The following sections define the various roles and the
  -  responsibilities of each role.
  -  </p>
  -
     <h2>Users</h2>
   
     <p>
  @@ -157,6 +152,11 @@
     Committer that has been inactive for 6 months or more may lose his
     or her status as a Committer.
     </p>
  +
  +  <p>
  +  A list of our current Committers can be found in our <a
  +  href="../credits/whoweare.html">Project Credits</a>.
  +  </p>
     
     <p>
     <h2>Project Management Committee (PMC)</h2>
  @@ -172,6 +172,11 @@
     <p>
     To view the Project Management Committee bylaws, <a href=management.html>
     click here</a>.
  +
  +  <p>
  +  A list of our current PMC Members can be found in our <a
  +  href="../credits/whoweare.html">Project Credits</a>.
  +  </p>
       
   
   
  
  
  
  1.4       +10 -5     jakarta-site/guidelines/roles.htsrc
  
  Index: roles.htsrc
  ===================================================================
  RCS file: /home/cvs/jakarta-site/guidelines/roles.htsrc,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- roles.htsrc	1999/10/07 00:27:23	1.3
  +++ roles.htsrc	1999/10/08 03:32:01	1.4
  @@ -14,11 +14,6 @@
     obtain the right to vote and commit directly to the source repository.
     </p>
   
  -  <p>
  -  The following sections define the various roles and the
  -  responsibilities of each role.
  -  </p>
  -
     <h2>Users</h2>
   
     <p>
  @@ -68,6 +63,11 @@
     Committer that has been inactive for 6 months or more may lose his
     or her status as a Committer.
     </p>
  +
  +  <p>
  +  A list of our current Committers can be found in our <a
  +  href="../credits/whoweare.html">Project Credits</a>.
  +  </p>
     
     <p>
     <h2>Project Management Committee (PMC)</h2>
  @@ -83,6 +83,11 @@
     <p>
     To view the Project Management Committee bylaws, <a href=management.html>
     click here</a>.
  +
  +  <p>
  +  A list of our current PMC Members can be found in our <a
  +  href="../credits/whoweare.html">Project Credits</a>.
  +  </p>
       
   </body>
   </html>
  
  
  
  1.7       +5 -5      jakarta-site/guidelines/source.html
  
  Index: source.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site/guidelines/source.html,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- source.html	1999/10/07 08:55:05	1.6
  +++ source.html	1999/10/08 03:32:02	1.7
  @@ -1,6 +1,6 @@
   <html>
   <head>
  -<!-- $Id: source.html,v 1.6 1999/10/07 08:55:05 duncan Exp $ -->
  +<!-- $Id: source.html,v 1.7 1999/10/08 03:32:02 duncan Exp $ -->
   <!-- Copyright 1999, Apache Software Foundation -->
   <!-- Content head element begins -->
   
  @@ -114,9 +114,9 @@
   
     <p>
     All source code committed to the Project's repositories must be
  -  covered by the Apache License or contain a copyright and license
  -  that allows redistribution under the same conditions as the Apache
  -  License.
  +  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>
  @@ -149,7 +149,7 @@
   
     <p>
     Simple patches to fix bugs can be committed then reviewed. With a
  -  commit-then-review process, the Developer is trusted to have a high
  +  commit-then-review process, the Committer is trusted to have a high
     degree of confidence in the change.
     </p>
   
  
  
  
  1.4       +4 -4      jakarta-site/guidelines/source.htsrc
  
  Index: source.htsrc
  ===================================================================
  RCS file: /home/cvs/jakarta-site/guidelines/source.htsrc,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- source.htsrc	1999/10/07 08:55:06	1.3
  +++ source.htsrc	1999/10/08 03:32:02	1.4
  @@ -25,9 +25,9 @@
   
     <p>
     All source code committed to the Project's repositories must be
  -  covered by the Apache License or contain a copyright and license
  -  that allows redistribution under the same conditions as the Apache
  -  License.
  +  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>
  @@ -60,7 +60,7 @@
   
     <p>
     Simple patches to fix bugs can be committed then reviewed. With a
  -  commit-then-review process, the Developer is trusted to have a high
  +  commit-then-review process, the Committer is trusted to have a high
     degree of confidence in the change.
     </p>
   
  
  
  
  1.8       +5 -3      jakarta-site/mission/index.html
  
  Index: index.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site/mission/index.html,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- index.html	1999/10/07 08:55:12	1.7
  +++ index.html	1999/10/08 03:32:05	1.8
  @@ -1,6 +1,6 @@
   <html>
   <head>
  -<!-- $Id: index.html,v 1.7 1999/10/07 08:55:12 duncan Exp $ -->
  +<!-- $Id: index.html,v 1.8 1999/10/08 03:32:05 duncan Exp $ -->
   <!-- Copyright 1999, Apache Software Foundation -->
   <!-- Content head element begins -->
   
  @@ -110,8 +110,10 @@
   the latest versions of the Servlet and JavaServer Pages specifications
   available from Sun. The Servlet and JavaServer Pages specifications
   are defined and evolved through the Java Community Process and can be
  -found at <a href=http://java.sun.com/products/jsp/download.html>
  -http://java.sun.com/products/jsp/download.html</a>.
  +found at <a href=http://java.sun.com/products/servlet/>
  +http://java.sun.com/products/servlet/</a> and <a
  +href=http://java.sun.com/products/jsp/>
  +http://java.sun.com/products/jsp/</a>.
   </p>
   
   
  
  
  
  1.4       +4 -2      jakarta-site/mission/index.htsrc
  
  Index: index.htsrc
  ===================================================================
  RCS file: /home/cvs/jakarta-site/mission/index.htsrc,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- index.htsrc	1999/10/07 08:55:12	1.3
  +++ index.htsrc	1999/10/08 03:32:05	1.4
  @@ -21,8 +21,10 @@
   the latest versions of the Servlet and JavaServer Pages specifications
   available from Sun. The Servlet and JavaServer Pages specifications
   are defined and evolved through the Java Community Process and can be
  -found at <a href=http://java.sun.com/products/jsp/download.html>
  -http://java.sun.com/products/jsp/download.html</a>.
  +found at <a href=http://java.sun.com/products/servlet/>
  +http://java.sun.com/products/servlet/</a> and <a
  +href=http://java.sun.com/products/jsp/>
  +http://java.sun.com/products/jsp/</a>.
   </p>
   
   </body>