Author: husted
Date: Wed Sep 14 05:34:23 2005
New Revision: 280836

URL: http://svn.apache.org/viewcvs?rev=280836&view=rev
Log:
Continue copy editing for the 1.3.0 release.

Modified:
    struts/core/trunk/xdocs/index.xml
    struts/core/trunk/xdocs/roadmap.xml
    struts/core/trunk/xdocs/userGuide/building_model.xml
    struts/core/trunk/xdocs/userGuide/index.xml
    struts/core/trunk/xdocs/userGuide/preface.xml
    struts/site/trunk/xdocs/bylaws.xml
    struts/site/trunk/xdocs/download.xml
    struts/site/trunk/xdocs/helping.xml
    struts/site/trunk/xdocs/mail.xml
    struts/site/trunk/xdocs/navigation.xml
    struts/site/trunk/xdocs/releases.xml
    struts/site/trunk/xdocs/volunteers.xml

Modified: struts/core/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewcvs/struts/core/trunk/xdocs/index.xml?rev=280836&r1=280835&r2=280836&view=diff
==============================================================================
--- struts/core/trunk/xdocs/index.xml (original)
+++ struts/core/trunk/xdocs/index.xml Wed Sep 14 05:34:23 2005
@@ -21,25 +21,29 @@
         <a href="userGuide/preface.html">standard technologies</a> like Java
         Servlets, JavaBeans, ResourceBundles, and XML, as well as various
         <a href="http://jakarta.apache.org/commons/index.html";>Jakarta
-        Commons</a> packages.
+        Commons</a> packages, like BeanUtils and Chain of Responsibility.
         Core helps you create an extensible development environment for your
         application, based on published standards and proven design patterns.
     </p>
 
     <p>
         Struts Core provides its own <strong>Controller</strong> component and
-        integrates with <a href="userGuide/preface.html#layers">
-        other technologies</a> to provide the Model and the View.
+        integrates with other technologies to provide the Model and the View.
         For the <strong>Model</strong>, Core can interact
         with standard data access technologies,
         like <a href="http://java.sun.com/products/jdbc/";>JDBC</a> and
         <a href="http://java.sun.com/products/ejb/";>EJB</a>,
         as well as most any third-party packages,
-        like Hibernate, iBATIS, or Object Relational Bridge.
+        like
+        <a href="http://hibernate.org/";>Hibernate</a>,
+        <a href="http://ibatis.apache.org/";>iBATIS</a>, or
+        <a href="http://db.apache.org/ojb/";>Object Relational Bridge</a>.
         For the <strong>View</strong>, Core works well with
         <a href="http://java.sun.com/products/jsp/";>JavaServer Pages</a>,
         including <a href="./faqs/kickstart.html#jsf">JSTL and JSF</a>,
-        as well as Velocity Templates, XSLT,
+        as well as
+        <a href="http://jakarta.apache.org/velocity/tools/struts/";>Velocity 
Templates</a>,
+        <a href="http://stxx.sourceforge.net/";>XSLT</a>,
         and other presentation systems.
     </p>
 
@@ -130,8 +134,8 @@
         <a href="http://jakarta.apache.org/commons/digester/";> Digester's</a>
         <code>set-property</code> feature.
         This is one reason why there are so many
-        <a 
href="http://struts.sourceforge.net/community/index.html";>contributor
-        extensions</a> for Struts Core.
+        <a href="http://wiki.apache.org/struts/StrutsResources/";>contributor
+        extensions</a> for Struts.
         Core provides a base framework, but you can still write <b>your</b>
         application <b>your</b> way.
      </p>

Modified: struts/core/trunk/xdocs/roadmap.xml
URL: 
http://svn.apache.org/viewcvs/struts/core/trunk/xdocs/roadmap.xml?rev=280836&r1=280835&r2=280836&view=diff
==============================================================================
--- struts/core/trunk/xdocs/roadmap.xml (original)
+++ struts/core/trunk/xdocs/roadmap.xml Wed Sep 14 05:34:23 2005
@@ -85,14 +85,15 @@
         Struts SourceForge</a> site.
         (If you are the author of such an extension,
         and would like to donate it to Apache Struts,
-        please contact the dev@ list.)
+        please contact the <a href="http://struts.apache.org/mail.html";>
+        Struts dev mailing list</a>.)
     </p>
 
     <p>
         As a convenience, the subprojects repredenting the Struts 1.2.x
         code base are being bundled into a single distribution called
         "Struts Classic".
-        Comments previously made about the "Struts 1.x series" now apply to
+        Remarks previously made about the "Struts 1.x series" now apply to
         the "Struts Classic" series.
     </p>
 
@@ -105,12 +106,12 @@
         New features are being added to the Struts Classic series,
         but only if backward compatability with the prior release can be
         retained.
-        The Struts Classic API is evolving through a deprecate/replace/remove
-        protocol.
+        The Struts Classic API is evolving through a strict
+        deprecate/replace/remove protocol.
         Developers are encouraged to stay current with the "best available"
         release and to observe deprecation warnings.
         Features are deprecated before removal, and deprecated features are
-        ultimately removed.
+        removed in a subsequent release.
     </p>
 
     <p>
@@ -132,7 +133,7 @@
     <p>
         Future release <a href="milestones.html">milestones</a> are provided
         for enhancements which are being actively planned or developed
-        but may not be ready for the very next release.
+        but may not be ready for the current release.
         If a report has not been tagged for a specific milestone
         by a working developer,
         then <strong>it may never be implemented</strong>.
@@ -168,13 +169,11 @@
         </p>
 
         <p>
-            As planned,
-            in Struts Core 1.3.x we will integrate Struts Chain from config
-            and add an "extends" attribute to all the configuration elements
-            (a la Tiles).
-            While we're at it,
-            we may also add a Ant-style properties file to make variable
-            substitutions within the XML elements.
+            Struts Core 1.3.x utilizes Struts Chain as the default request
+            processor and adds an "extends" attribute to all the
+            configuration elements (a la Tiles).
+            We would also like to add a Ant-style properties file to make
+            variable substitutions within the XML elements.
             The substitution feature is supported by Spring and iBATIS,
             among others.
             Substitutions are a useful way to configure applications
@@ -186,12 +185,13 @@
         </p>
 
         <p>
-            Those items by themselves seem like enough for a release,
-            but we might add a few "experimental" classes and interfaces to
-            give us a chance to use Struts Chain in our own applications.
-            We came up with two experimental classes
-            and an experimental interface:
-            ActionCommand, ActionContext, and ViewContext.
+            To lay the groundwork for future changes,
+            three "experimental" classes and interfaces are being added to
+            Struts Core so that early adopters can experiment with using
+            Struts Chain to develop applications.
+            We do consider these members experimental,
+            and they are subject to change,
+            based on our experience using them with our own applications.
         </p>
 
         <p>
@@ -229,7 +229,7 @@
         </p>
 
         <p>
-            In a later release,
+            In a later release, when the new members stabalize,
             we could move the taglib dependencies from the servlet contexts
             to the ViewContext.
             View technologies could then look exclusively to the ViewContext
@@ -376,7 +376,10 @@
             struts-config which often confuse new developers.
             By either supporting alternative configuration loaders,
             or applying a stylesheet to a XML configuration,
-            we could support both the "classic" and a new configuration.
+            we could support both the "classic" and a new configuration
+            (based on something like
+            <a href="http://wiki.apache.org/struts/StrutsJericho";>
+            Struts Jericho</a>).
         </p>
     </subsection>
 
@@ -444,13 +447,12 @@
 
         <li>
             <a 
href="http://cvs.apache.org/viewcvs/jakarta-struts/contrib/struts-chain/";>
-            CoRe Request Processor</a>
+            Struts Chain Request Processor</a>
         </li>
 
-
         <li>
-            <a href="http://wiki.apache.org/struts/StrutsRelease126";>
-                Release Plan 1.2.6</a>
+            <a href="http://wiki.apache.org/struts/StrutsClassicRelease130";>
+             Struts Classic Release Plan 1.3.0</a>
         </li>
 
         <li>
@@ -461,22 +463,22 @@
                    <a href="http://wiki.apache.org/struts/StrutsJericho";>
             Struts Jericho</a>
                </li>
-                   
-                   
+
                <li>
                    <a href="http://wiki.apache.org/struts/StrutsShale";>
             Struts Shale</a>
        </li>
        
-       <li>
-                   <a href="http://wiki.apache.org/struts/StrutsOverDrive";>
-            Struts OverDrive</a>
-          </li>
-       
         <li>
              <a href="http://wiki.apache.org/struts/StrutsTi";>
              Struts Ti</a>
         </li>
+
+        <li>
+             <a href="http://wiki.apache.org/struts/StrutsOverDrive";>
+             Struts OverDrive</a>
+        </li>
+
     </ul>
 
 </subsection>

Modified: struts/core/trunk/xdocs/userGuide/building_model.xml
URL: 
http://svn.apache.org/viewcvs/struts/core/trunk/xdocs/userGuide/building_model.xml?rev=280836&r1=280835&r2=280836&view=diff
==============================================================================
--- struts/core/trunk/xdocs/userGuide/building_model.xml (original)
+++ struts/core/trunk/xdocs/userGuide/building_model.xml Wed Sep 14 05:34:23 
2005
@@ -13,6 +13,7 @@
 <body>
 <section name="2. Building Model Components">
 
+<a name="overview"/>
 <subsection name="2.1 Overview">
 
     <p>
@@ -32,6 +33,7 @@
     
 </subsection>
 
+<a name="javabeans"/>
 <subsection name="2.2 JavaBeans and Scope">
 
     <p>
@@ -101,14 +103,16 @@
 
 </subsection>
 
+<a name="actionform"/>
 <subsection name="2.3 ActionForm Beans">
 
     
-    <strong>Note:</strong> While ActionForm beans often have properties that 
-    correspond to properties in your Model beans, the form beans themselves 
-    should be considered a Controller component. 
+    <p>
+    <strong>Note:</strong> While ActionForm beans often have properties that
+    correspond to properties in your Model beans, the form beans themselves
+    should be considered a Controller component.
     As such, they are able to transfer data between the Model and View layers.
-    
+    </p>
 
     <p>
     The Struts framework generally assumes that you have defined an
@@ -194,6 +198,7 @@
 
 </subsection>
 
+<a name="system_state"/>
 <subsection name="2.4 System State Beans">
 
     <p>
@@ -224,6 +229,7 @@
 
 </subsection>
 
+<a name="business_logic"/>
 <subsection name="2.5 Business Logic Beans">
 
     <p>
@@ -261,6 +267,11 @@
     Enterprise JavaBeans (EJBs) instead.
     </p>
 
+</subsection>
+
+<a name="logic_frameworks"/>
+<subsection name="2.6 Business Logic Frameworks">
+
     <p>
         Most teams still roll their own business logic layer using
         plain old JavaBeans (POJOs).
@@ -271,12 +282,6 @@
             <li>
                <a href="http://jakarta.apache.org/commons/chain/";>
                    Commons Chain</a>
-                <ul>
-                    <li>
-                        <a href="http://www.onjava.com/lpt/a/5671";>
-                          A look at Commons Chain</a>
-                    </li>
-                </ul>
             </li>
             <li>
                 <a href="http://springframework.org/";>Spring</a>
@@ -286,6 +291,11 @@
             </li>
         </ul>
 
+</subsection>
+
+<a name="data_frameworks"/>    
+<subsection name="2.6 Data Access Frameworks">
+
     <p>
         Most often, the business layer is seen to be distinct from the
         data access layer.
@@ -297,7 +307,8 @@
 
         <ul>
             <li>
-                <a 
href="http://java.sun.com/products/ejb/index.html";>Enterprise Java Beans</a>
+                <a href="http://java.sun.com/products/ejb/index.html";>
+                    Enterprise Java Beans</a>
             </li>
             <li>
                 <a href="http://www.hibernate.org/";>Hibernate</a>
@@ -306,10 +317,12 @@
                 <a href="http://ibatis.apache.org";>iBATIS</a>
             </li>
             <li>
-                <a href="http://java.sun.com/products/jdbc/index.html";>JDBC</a>
+                <a href="http://java.sun.com/products/jdbc/index.html";>
+                    JDBC</a>
            </li>
             <li>
-                <a href="http://db.apache.org/ojb/";>Object Relational 
Bridge</a>
+                <a href="http://db.apache.org/ojb/";>
+                    Object Relational Bridge</a>
             </li>
         </ul>
 

Modified: struts/core/trunk/xdocs/userGuide/index.xml
URL: 
http://svn.apache.org/viewcvs/struts/core/trunk/xdocs/userGuide/index.xml?rev=280836&r1=280835&r2=280836&view=diff
==============================================================================
--- struts/core/trunk/xdocs/userGuide/index.xml (original)
+++ struts/core/trunk/xdocs/userGuide/index.xml Wed Sep 14 05:34:23 2005
@@ -47,6 +47,8 @@
                 <li><a href="building_model.html#actionform">2.3 ActionForm 
Beans</a></li>
                 <li><a href="building_model.html#system_state">2.4 System 
State Beans</a></li>
                 <li><a href="building_model.html#business_logic">2.5 Business 
Logic Beans</a></li>
+                <li><a href="building_model.html#logic_frameworks">2.6 
Business Logic Frameworks</a></li>
+                 <li><a href="building_model.html#data_frameworks">2.7 Data 
Access Frameworks</a></li>
                 </ul></li>
             <li><a href="building_view.html">3. Building View Components</a>
                 <ul>

Modified: struts/core/trunk/xdocs/userGuide/preface.xml
URL: 
http://svn.apache.org/viewcvs/struts/core/trunk/xdocs/userGuide/preface.xml?rev=280836&r1=280835&r2=280836&view=diff
==============================================================================
--- struts/core/trunk/xdocs/userGuide/preface.xml (original)
+++ struts/core/trunk/xdocs/userGuide/preface.xml Wed Sep 14 05:34:23 2005
@@ -143,6 +143,65 @@
 
     </subsection>
 
+      <a name="chain"/>
+      <subsection name="0.4.1 Chain of Responsibility">
+
+          <p>
+              A popular technique for organizing the execution of complex
+              processing flows is the "Chain of Responsibility" pattern,
+              as described (among many other places) in the classic
+              <a 
href="http://www.amazon.com/exec/obidos/tg/detail/-/0201633612/apachesoftwar-20/";>
+              "Gang of Four" design patterns book.</a>.
+              The GoF summarizes the Chain of Responsibility pattern as
+              "Avoid coupling  the sender of a reuest to its receiver
+              by giving more than object a chance to handle the request.
+              Chain the receiving objects
+              and pass the request along the chain until an object handles it."
+          </p>
+
+          <p>
+              The CoR pattern helps us keep software components loosely 
coupled.
+              A component can call a Chain of Responsbility,
+              without knowing what objects are on the chain or how they are
+              implemented.
+              Most importantly, we can adjust the Chain without changing
+              how callers invoke the Chain.
+              As of Struts Core 1.3,
+              the Request Processor, which servers as the frameworks "kernal",
+              is a Chain of Responsiblity.
+          </p>
+
+          <p>
+              To implement its Chain, the Request Processor uses the
+              <a hhref="http://jakarta.apache.org/commons/chain/";>
+              Chain of Responsibility </a>component in the Jakarta Commons
+              provides a standard implementation of the CoR pattern,
+              along with various implementations of the Context and
+              Command objects used by the Chain to service a request.
+          </p>
+
+          <p>
+          For more about Chain of Responsiblity, see
+          </p>
+
+          <ul>
+              <li>
+                  <a hhref="http://jakarta.apache.org/commons/chain/";>
+                     Jakarta Commons Chain of Responsibility </a>
+              </li>
+              <li>
+                  <a href="http://www.onjava.com/lpt/a/5671";>
+                      A look at Commons Chain</a>
+              </li>
+              <li>
+                  <a 
href="http://www.infonoia.com/en/content.jsp?d=inf.05.06&amp;pr=1";>
+                      Better Code with Struts 1t.3
+                  </a>
+              </li>
+          </ul>
+
+      </subsection>
+
     <a name="javabeans"/>
     <subsection name="0.5 JavaBeans">
 

Modified: struts/site/trunk/xdocs/bylaws.xml
URL: 
http://svn.apache.org/viewcvs/struts/site/trunk/xdocs/bylaws.xml?rev=280836&r1=280835&r2=280836&view=diff
==============================================================================
--- struts/site/trunk/xdocs/bylaws.xml (original)
+++ struts/site/trunk/xdocs/bylaws.xml Wed Sep 14 05:34:23 2005
@@ -2,14 +2,12 @@
 <document url="./bylaws.xml">
 
   <properties>
-    <title>Project Management Committee Bylaws - Apache Struts Project</title>
+    <title>Project Management Committee Charter - Apache Struts Project</title>
   </properties>
 
 <body>
 
-<section name="Apache Struts Project G">
-
-    <subsection name="Charter">
+<section name="Apache Struts PMC Charter">
 
     <p>
     Struts is a Project of the <a href="http://apache.org/foundation";>
@@ -20,8 +18,6 @@
     and the direction of the ASF Board.
     </p>
 
-    </subsection>
-
     <subsection name="Roles and Responsibilities">
 
     <p>
@@ -299,13 +295,13 @@
     </p>
 
     </subsection>
+</section>
 
-    <subsection>
+    <section>
         <p class="right">
         Next: <a href="releases.html">Release Guidelines</a>
         </p>
-    </subsection>
+    </section>
 
-</section>
 </body>
 </document>

Modified: struts/site/trunk/xdocs/download.xml
URL: 
http://svn.apache.org/viewcvs/struts/site/trunk/xdocs/download.xml?rev=280836&r1=280835&r2=280836&view=diff
==============================================================================
--- struts/site/trunk/xdocs/download.xml (original)
+++ struts/site/trunk/xdocs/download.xml Wed Sep 14 05:34:23 2005
@@ -17,7 +17,7 @@
         distribution directory.
     </p>
 
-        <section name="Mirror">
+        <subsection name="Mirror">
         <a name="mirror"/>
 
         <p>
@@ -52,6 +52,8 @@
         <a href="http://www.apache.org/mirrors/";>complete list of mirrors</a>.
         </p>
 
+        </subsection>
+
         </section>
 
         <section name="Full Releases">
@@ -185,8 +187,6 @@
         </p>
 
         </section>
-
-    </section>
 
 </body>
 </document>

Modified: struts/site/trunk/xdocs/helping.xml
URL: 
http://svn.apache.org/viewcvs/struts/site/trunk/xdocs/helping.xml?rev=280836&r1=280835&r2=280836&view=diff
==============================================================================
--- struts/site/trunk/xdocs/helping.xml (original)
+++ struts/site/trunk/xdocs/helping.xml Wed Sep 14 05:34:23 2005
@@ -9,18 +9,17 @@
 <a name="faq"/>
 <section name="How to Help FAQ">
 
-<a name="contents"/>
-<subsection name="Index">
-
-<p>
+    <p align="center">
+    "You can't always get what you want / <br/>
+    but if you try real hard /  <br/>
+    you might just find / <br/>
+    that you get what you need".
+    <br/>
+    [Rolling Stones]
+    </p>
 
-"You can't always get what you want /
-but if you try real hard /
-you might just find /
-that you get what you need".
-<br/>
-[Rolling Stones]
-</p>
+<a name="contents"/>
+<subsection name="Topics">
 
 <ul>
     <li><a href="#involved">
@@ -630,8 +629,7 @@
         For more about decision-making, see
         "<a href="http://apache.org/foundation/how-it-works.html";>
         How the ASF Works</a>" and the
-        <a href="http://struts.apache.org/bylaws.html";>Apache Struts
-        Project Guidelines</a>.
+        <a href="bylaws.html">Apache Struts Charter</a>.
     </p>
 
 </subsection>

Modified: struts/site/trunk/xdocs/mail.xml
URL: 
http://svn.apache.org/viewcvs/struts/site/trunk/xdocs/mail.xml?rev=280836&r1=280835&r2=280836&view=diff
==============================================================================
--- struts/site/trunk/xdocs/mail.xml (original)
+++ struts/site/trunk/xdocs/mail.xml Wed Sep 14 05:34:23 2005
@@ -24,15 +24,21 @@
 <section name="Mailing Lists - Guidelines">
 <a name="Guidelines"/>
 
-<p>A mailing list is an electronic discussion forum that anyone can
-subscribe to. When someone sends an email message to the mailing list,
-a copy of that message is broadcast to everyone who is subscribed to
-that mailing list. Mailing lists provide a simple and effective
-communication mechanism. With potentially thousands of subscribers,
-there is a common set of etiquette guidelines that you should observe.
-Please keep on reading.
+<p>
+    A mailing list is an electronic discussion forum that anyone can
+    subscribe to. When someone sends an email message to the mailing list,
+    a copy of that message is broadcast to everyone who is subscribed to
+    that mailing list. Mailing lists are the primary meands of communication
+    for people working within the Apache Struts Project.
 </p>
 
+<subsection name="Mailing Lists - Guidelines">
+
+<p>
+    Mailing lists provide a simple and effective communication mechanism.
+    With potentially thousands of subscribers, there is a common set of
+    etiquette guidelines that you should observe. Please keep on reading.
+</p>
 
 <p>
 <strong>
@@ -141,9 +147,9 @@
 new and is considered off-topic.
 </p>
 
-</section>
+</subsection>
 
-<section name="Archives">
+<subsection name="Archives">
 <p>Archives Carrying Struts Lists</p>
 <ul>
 <li><a href="http://mail-archives.apache.org/";>ASF Mail Archives</a></li>
@@ -164,9 +170,9 @@
    </ul>
 <li><a 
href="http://www.servlets.com/archive/servlet/SummarizeList?listName=struts-user";>Servlets.com
 servlet and JSP list archives</a></li>
 </ul>
-</section>
+</subsection>
 
-<section name="Subscribing">
+<subsection name="Subscribing">
 <p>
 Now that you've read the guidelines (you <em>have</em> read the rest of the 
page, haven't you?), please subscribe to
 whichever Struts lists are of interest. 
@@ -229,11 +235,14 @@
         We thank you for your cooperation.
     </p>
 
+</subsection>
 </section>
+
 <section>
     <p class="right">
         <strong>Back to:</strong> <a href="helping.html">How to Help FAQ</a>
     </p>
 </section>
+
 </body>
 </document>

Modified: struts/site/trunk/xdocs/navigation.xml
URL: 
http://svn.apache.org/viewcvs/struts/site/trunk/xdocs/navigation.xml?rev=280836&r1=280835&r2=280836&view=diff
==============================================================================
--- struts/site/trunk/xdocs/navigation.xml (original)
+++ struts/site/trunk/xdocs/navigation.xml Wed Sep 14 05:34:23 2005
@@ -78,7 +78,7 @@
 
     <menu name="Development">
         <item
-            name="Bylaws"
+            name="Charter"
             href="bylaws.html"
             />
         <item

Modified: struts/site/trunk/xdocs/releases.xml
URL: 
http://svn.apache.org/viewcvs/struts/site/trunk/xdocs/releases.xml?rev=280836&r1=280835&r2=280836&view=diff
==============================================================================
--- struts/site/trunk/xdocs/releases.xml (original)
+++ struts/site/trunk/xdocs/releases.xml Wed Sep 14 05:34:23 2005
@@ -7,17 +7,18 @@
     <title>Release Guidelines - Apache Struts Project</title>
   </properties>
   <body>
-    <section name="Release Guidelines">
+
     <a name="status"/>
+    <section name="Release Guidelines">
     <p>This document describes the Apache Struts
       <a href="#Releases">release process</a> and our
       <a href="#Coding">coding conventions</a>,
       which are applicable to all subprojects.
       Both stable and development releases are
       <a href="acquiring.html">available for download</a>.</p>
-    </section>
-    <section name="Release Guidelines">
-    <a name="Releases"/>
+
+    <a name="Releasing"/>
+    <subsection name="Release Process">
       <p>A
       <a 
href="http://jakarta.apache.org/commons/releases/versioning.html";>point 
release</a> should be made before and after any product change that is not a 
"fully-compatible change" (see link). This includes moving a dependency from an 
internal package to an external product, including products distributed through 
the Jakarta Commons. We should place any fully-compatible changes in the hands 
of the community before starting on a change that is only "interface" or 
"external-interface" compatible.</p>
       <p>
@@ -51,9 +52,9 @@
         <li>After announcing a release, remember to update the Acquiring and 
Announcements pages. If the release is to be mirrored, wait at least 24 hours 
after submittal before making public announcements (as stated in the <a 
href="http://apache.org/dev/mirrors.html";>Apache Mirroring guidelines</a>).</li>
         <li>If a serious flaw if found in a test build or release, it may be 
withdrawn by a majority vote of the PMC and removed from ASF distribution 
channels.</li>
       </ul>
-    </section>
-    <section name="Coding Conventions and Guidelines">
+    </subsection>
     <a name="Coding"/>
+    <subsection name="Coding Conventions and Guidelines">
       <p>Source code and documentation contributed to the Struts repositories 
should observe the:</p>
       <ul>
         <li>
@@ -110,7 +111,8 @@
         <a href="http://news.bbc.co.uk/1/hi/uk/1326657.stm";>Douglas Adams</a>).
         </li>
       </ul>
-    </section>
+    </subsection>
+  </section>
     <section>
       <p class="right">Next: 
       <a href="javadoc.html">Javadoc Index</a></p>

Modified: struts/site/trunk/xdocs/volunteers.xml
URL: 
http://svn.apache.org/viewcvs/struts/site/trunk/xdocs/volunteers.xml?rev=280836&r1=280835&r2=280836&view=diff
==============================================================================
--- struts/site/trunk/xdocs/volunteers.xml (original)
+++ struts/site/trunk/xdocs/volunteers.xml Wed Sep 14 05:34:23 2005
@@ -6,7 +6,9 @@
 
    <body>
       <section name="Who We Are">
-         <subsection name="Community Support">
+
+          <a name="statistics" />
+          <subsection name="List Subscribers and Downloads">
          
             <p>In July 2005, there were more than 2800 subscribers to
             STRUTS-USER (including the digest version). In addition to the
@@ -18,6 +20,7 @@
              statistics</a>, Struts downloads range around 15,000 a month.</p>
          </subsection>
 
+         <a name="pmc" />
          <subsection name="Project Management Committee Members">
             <ul>
                <li>
@@ -29,10 +32,6 @@
                (husted at apache.org)</li>
 
                <li>
-               <strong>Rob Leland</strong>
-               (rleland at apache.org)</li>
-
-               <li>
                <strong>Cedric Dumoulin</strong>
                (cedric.dumoulin at lifl.fr)</li>
 
@@ -41,10 +40,6 @@
                (martinc at apache.org)</li>
 
                <li>
-               <strong>Arron Bates</strong>
-               (arron at apache.org)</li>
-
-               <li>
                <strong>James Holmes</strong>
                (jholmes at apache.org)</li>
 
@@ -82,6 +77,7 @@
             </ul>
          </subsection>
 
+         <a name="committers" />
          <subsection name="Committers">
             <ul>
 
@@ -104,6 +100,7 @@
             </ul>
          </subsection>
 
+         <a name="emeritus" />
          <subsection name="Emeritus Committers">
             <ul>
                <li>Luis Arias</li>
@@ -118,9 +115,18 @@
 
                <li>Oleg Alexeev</li>
 
+               <li>>Rob Leland</li>
+
+               <li>Arron Bates</li>
+
+               <li>Steve Raeburn</li>
+
+               <li>James Turner</li>
+
             </ul>
          </subsection>
 
+         <a name="about" />
          <subsection name="More About Us">
             <h4 id="craigmcc">Craig R. McClanahan -- PMC Member</h4>
 
@@ -291,7 +297,7 @@
                 books include JUnit in Action, Struts in Action, and
                 Professional JSP Site Design. I've consulted with Struts teams
                 throughout the United States, including CitiGroup, Nationwide
-                Insurance, and PepsiCo.
+                Insurance, and the Pepsi Bottling Group.
              </p>
 
              <p>
@@ -407,7 +413,7 @@
                 publishing process.
             </p>
 
-            <h4 id="rleland">Rob Leland -- PMC Member</h4>
+            <h4 id="rleland">Rob Leland -- Emeritus PMC Member</h4>
 
             <p>
                 I have gone from Unix -to- Windows -to- Unix based development
@@ -745,13 +751,13 @@
             invited to become a Struts Committer in July 2005.</p>
 
          </subsection>
+      </section>
 
-         <subsection>
+         <section>
             <p class="right">Next:
             <a href="announce.html">Announcements</a>
             </p>
-         </subsection>
-      </section>
+         </section>
    </body>
 </document>
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to