You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by hu...@apache.org on 2006/07/06 16:13:01 UTC

svn commit: r419560 - in /struts/site/src/site: fml/helping.fml fml/kickstart.fml fml/roadmap.fml xdoc/announce-2005.xml xdoc/announce.xml xdoc/index.xml xdoc/mail.xml xdoc/volunteers.xml

Author: husted
Date: Thu Jul  6 07:13:00 2006
New Revision: 419560

URL: http://svn.apache.org/viewvc?rev=419560&view=rev
Log:
=SITE-8 : Crib layout of welcome page from Cocoon; other SAF # to Struts # updates. 

Modified:
    struts/site/src/site/fml/helping.fml
    struts/site/src/site/fml/kickstart.fml
    struts/site/src/site/fml/roadmap.fml
    struts/site/src/site/xdoc/announce-2005.xml
    struts/site/src/site/xdoc/announce.xml
    struts/site/src/site/xdoc/index.xml
    struts/site/src/site/xdoc/mail.xml
    struts/site/src/site/xdoc/volunteers.xml

Modified: struts/site/src/site/fml/helping.fml
URL: http://svn.apache.org/viewvc/struts/site/src/site/fml/helping.fml?rev=419560&r1=419559&r2=419560&view=diff
==============================================================================
--- struts/site/src/site/fml/helping.fml (original)
+++ struts/site/src/site/fml/helping.fml Thu Jul  6 07:13:00 2006
@@ -305,12 +305,10 @@
                     through the
                     <a href="http://issues.apache.org/struts/">Apache Struts 
                         JIRA instance.</a>
-                    Please select
-                    <strong>Struts</strong>
-                    from the product list, along with
-                    the details of which component of Struts you feel this
-                    report
-                    relates to, and details of your operating environment.
+                    Please select the appropriate Apache Struts product from 
+                    the list, 
+                    and then select the component to which you feel this report
+                    relates.
                     You will automatically be notified by email as the status
                     of your defect or
                     enhancement report changes.
@@ -318,7 +316,7 @@
                     <a href="http://www.chiark.greenend.org.uk/~sgtatham/bugs.html">
                         How to
                         Report Bugs Effectively</a>
-                    before posting.
+                    before posting a report.
                 </p>
 
                 <p>
@@ -478,27 +476,34 @@
             <question>How can I contribute to the
                 documentation?</question>
             <answer>
-
+            
+            	<p>
+            	    The Struts 2 documentation is maintained using a 
+            	    Atlassian Confluence wiki and then exported to HTML 
+            	    for viewing on the website. 
+            	    To help out, 
+            	    <a href="http://confluence.twdata.org/display/WW/Home">
+            	    sign up for account on the wiki.</a>
+                </p>
                 <p>
-                    The documentation is maintained in the repository
+                    The Struts 1 documentation is maintained in the repository
                     under
                     the
                     <code>xdocs</code>
                     folder for the subproject.
                     To build just the documentation for a subproject,
                     change to the subprojects trunk directory and run
-                    <code>maven site</code>
-                    .
+                    <code>maven site</code>.                    .
                     The Maven build compiles the site and stores the
                     output
                     under
-                    <code>target/docs/</code>
-                    .
+                    <code>target/docs/</code>.
+                    See <a href="http://wiki.apache.org/struts/StrutsMaintenanceWebsite">
+                    Struts Maintenance Website</a> for details.
                 </p>
-
                 <p>
                     Procedurally, the only difference between patching
-                    documentation and
+                    the Struts 1 documentation and
                     software is that the docs are kept in XML rather than
                     Java
                     source code.

Modified: struts/site/src/site/fml/kickstart.fml
URL: http://svn.apache.org/viewvc/struts/site/src/site/fml/kickstart.fml?rev=419560&r1=419559&r2=419560&view=diff
==============================================================================
--- struts/site/src/site/fml/kickstart.fml (original)
+++ struts/site/src/site/fml/kickstart.fml Thu Jul  6 07:13:00 2006
@@ -36,25 +36,15 @@
             <a href="http://struts.apache.org/1.2.9/userGuide/index.html">
             Preface to the User Guide</a>.
             </p>
-
-            <p>
-            The main website is devoted to the upcoming version, Struts
-            1.3. This version is at the
-            "<a href="http://svn.apache.org/dist/struts/action-lib/">test
-            build</a>" stage now, but it is still 100% backwardly compatible
-            with Struts 1.2.9.
-            </p>
-
+            
             <p>
-            Meanwhile, for the Struts 2 release, 
-            we "joined forces" with another project,
-            <a href="http://www.opensymphony.com/webwork/">OpenSymphony
-            WebWork.</a>
-            The WebWork codebase was donated to Apache Struts;
-            and the WebWork developers have joined the Apache Struts team.
-            Essentially, Struts 2.0 will be WebWork 2.3.
+            The main Struts website covers the latest, unreleased version of 
+            each major release series (Struts 1.3 and Struts 2.0). 
+            The documentation for past releases are also available online. 
+            See the navigational menu for links to the documentation for 
+            each release. 
             </p>
-
+            
             <p>
             To learn more about using Apache Struts, you can also visit
             <a href="http://www.StrutsCentral.net/">Struts Central</a>,
@@ -160,20 +150,16 @@
     </part>
 
     <part id="support">
-        <title>Support</title>
+        <title>Product Support</title>
         <faq id="help">
             <question>Where can I get help with Apache Struts?</question>
             <answer>
-                <p>Struts comes complete with a
-                    <a href="../userGuide/index.html">Users Guide</a>
-                    to
-                    introduce people to the framework and its underlying
-                    technologies. Various components
+                <p>Each release of Struts comes with a
+                    User Guide or set of Tutorials to introduce people to the 
+                    framework and its underlying technologies. Various components
                     also have their own in-depth Developers Guide, to cover
-                    more advanced topics. Comprehensive
-                    <a href="../api/index.html">Javadocs</a>
-                    are included
-                    along with the
+                    more advanced topics. Comprehensive Javadocs
+                    are provided for each release, along with the
                     <strong>full source code.</strong>
                 </p>
                 <p>
@@ -199,12 +185,12 @@
             </answer>
         </faq>
 
-        <faq id="support">
+        <faq id="commercial">
             <question>Is commercial support available?</question>
             <answer>
                 <p>The Apache Software Foundation does not provide commercial
                     support for any of our software products, including Apache
-                    Struts products.
+                    Struts.
                     However, third parties may offer different degrees of
                     support.</p>
             </answer>
@@ -245,8 +231,8 @@
         </faq>
     </part>
 
-    <part id="community">
-        <title>Community</title>
+    <part id="lists">
+        <title>Mailing Lists</title>
         <faq id="digest">
             <question>Is there a digest for the User list?</question>
             <answer>
@@ -304,6 +290,24 @@
                 </p>
             </answer>
         </faq>
+
+        <faq id="labels">
+            <question>Are there separate user lists for Struts 1 and Struts 2?</question>
+            <answer>
+                <p>
+                    No. Each major version has it's own JIRA project, 
+                    but we share the mailing lists.  
+                </p>
+                <p>
+                   To get the best response to an inquiry, 
+                   please specify which version of Struts is being used, 
+                   including the milestone ("Struts 1.2.4", for example).
+                   You can also include the label <strong>[struts1]</strong> or 
+                   <strong>[struts2]</strong> in the subject line of your post. 
+                </p>
+            </answer>
+        </faq>
+
 
         <faq id="unsubscribe">
             <question>How do I unsubscribe from the mailing list?</question>

Modified: struts/site/src/site/fml/roadmap.fml
URL: http://svn.apache.org/viewvc/struts/site/src/site/fml/roadmap.fml?rev=419560&r1=419559&r2=419560&view=diff
==============================================================================
--- struts/site/src/site/fml/roadmap.fml (original)
+++ struts/site/src/site/fml/roadmap.fml Thu Jul  6 07:13:00 2006
@@ -34,12 +34,11 @@
                     Pursuant to this plan, WebWork 2.3 was
                     donated to the ASF in March 2006,
                     and the active WebWork committers joined the Apache Struts project.
-                    The WebWork 2.3 codebase is being brought into the ASF through
+                    The WebWork 2.3 codebase was brought into the ASF through
                     the
                     <a href="http://incubator.apache.org/projects/webwork2.html">
                         Apache Incubator.</a>
-                    Once licensing and related issues are resolved,
-                    the codebase will be made part of the Apache Struts
+                    The donated codebase is now part of the Apache Struts 
                     project.
                 </p>
                 <p>
@@ -50,23 +49,22 @@
                     framework that retains many Struts 1.x paradigms.
                 </p>
                 <p>
-                    People who have worked with both Struts 1.x and WebWork
-                    2.x tend to agree that it is a logical candidate for
-                    Struts 2.0.
-                    If you look the Struts 1.x roadmap and the WebWork
-                    2.x feature set,
-                    you'll see that WebWork has already does most of what we
-                    wanted Struts framework to do.
-                    If we finished the roadmap ourselves, Struts would
-                    end up as a WebWork workalike.
+                    People who have worked with both Struts 1 and WebWork
+                    2 tend to agree that it is a logical candidate for
+                    Struts 2.
+                    If you looked at the Struts 1 roadmap and the WebWork
+                    2 feature set,
+                    you'd see that WebWork has already does most of what we
+                    had wanted the Struts framework to do.
+                    If we had finished the original Struts 1 roadmap ourselves, 
+                    Struts 1 would have ended up being a WebWork 2 workalike.
                     Rather than reinvent the wheel,
                     Ti has become a proposal to put the WebWork wheel back on
                     the Struts axle.
                 </p>
                 <p>
                     At this point, the Ti codename has being dropped,
-                    and we are referring to the incoming WebWork codebase as Struts
-                    2.
+                    and we are referring to the donated codebase as Struts 2.
                 </p>
             </answer>
         </faq>
@@ -76,13 +74,16 @@
             why did WebWork evolve more quickly than Struts 1?</question>
             <answer>
             <p>
-              The Struts 1.x series is deeply into "backward compatibility" mode.
-              Backward compatibility is an obsession with Struts 1.
+              The Struts 1.x release series is deeply into "backward 
+              compatibility" mode.
+              Backward compatibility has become an obsession with Struts 1.
               Before making any API change, we deprecate the existing member,
-              and make at least one milestone release before removing the deprecated member.
+              and make at least one milestone release before removing the 
+              deprecated member.
               Each Struts milestone is drop-and-go compatible with the last.
               Maintaining this degree of stability takes a lot of effort,
-              but given the installed base, we feel it is worth the time and trouble.
+              but given the installed base, we feel it is worth the time and 
+              trouble.
             </p>
             <p>
               There have been several proposals for a new Struts 2 codebase.
@@ -98,15 +99,15 @@
               Shale is based on JavaServer Faces, and, when the time came,
               the Apache Struts PMC found that many of us were not ready to
               adopt JSF just yet.
-              Shale was a separate but equal framework,
-              created and maintained by the Apache Struts community,
-              but later moved to its own <a href="http://struts.apache.org/struts-shale">Struts Shale</a>
-              project.
+              Initially, Shale was a Struts subproject,
+              but later Shale graduated to its own 
+              <a href="http://struts.apache.org/struts-shale">top-level ASF 
+              project.</a>
            </p>
            <p>
                The Ti proposal included the idea of collaborating with other
                projects to build a "best of breed" framework that incorporated
-               everything we had learned over the past five years.
+               everything we had learned over the past six years.
                The original Ti proposal includes technology developed by
                <a href="http://beehive.apache.org/">Apache BeeHive,</a>
                <a href="http://www.springframework.org/">Spring,</a> and
@@ -146,16 +147,17 @@
                 Struts 2?</question>
             <answer>
                 <p>
-                    Many of us have significant Struts 1.x
+                    Many of us have significant Struts 1 
                     applications in production.
                     Being able to migrate both applications and developer
                     skill sets is important to all of us.
                 </p>
                 <p>
-                    Several
-                    <a href="http://wiki.apache.org/struts/MigrationStrategy">
-                        migration strategies</a>
-                    are being developed.
+                    The Struts 2 documentation includes a Migration Guide 
+                    that outlines several migration strategies. 
+                    Several classic Struts example applications, 
+                    including the MailReader, 
+                    are being migrated to Struts 2. 
                 </p>
             </answer>
         </faq>
@@ -187,23 +189,22 @@
             	to help people get started with Struts 1 or improve the application they already have.
             </p>
             <p>
-            	A new build of <a href="http://svn.apache.org/dist/struts/action-lib/">Struts 1.3 is available for testing</a>, 
-            	and a stable release is expected sometime in the first half of 2006.
+            	Since the merger, Struts 1.x has gone on to release a new minor version, Struts 1.3, 
+            	and new 1.x releases are being planned.
             	Apache Struts 1 continues to be the most popular and best supported 
             	web application framework for Java.
-		If time is of the essence, a proven solution can be easiest path.            	
             </p>
             
             <p>
-               If you are starting a new project, and have your choice of frameworks, 
+               Of course, if you are starting a new project, and have your choice of frameworks, 
                this would be a good time to consider whether you would like to continue to use 
                Struts 1 or <a href="#choice">whether it's time to try something else</a>. 
-	    </p>            
+            </p>            
           </answer>          
          </faq>
 
         <faq id="choice">
-            <question>Which Apache Struts version should I use on my next
+            <question>Which framework should I use on my next
                 project?</question>
 
             <answer>
@@ -223,7 +224,8 @@
                 <p>
                     JSF is designed to work well with visual design tools, much
                     like ASP.NET. Some people are finding that JSF is a faster way to
-                    write new applications. A good place to learn more about JSF is
+                    write new applications, especially modest intranet applications. 
+                    A good place to learn more about JSF is
                     <a href="http://jsfcentral.com/">JSF Central</a>
                     .
                 </p>
@@ -235,7 +237,7 @@
                 </p>
                 <p>
                     If you are a sole developer working on a small application,
-                    then you might not even need a framework.
+                    then <strong>you might not even need a framework.</strong>
                     Simple applications can be written with JSF or JSP with
                     <a href="http://java.sun.com/products/jsp/jstl/index.jsp">
                         JSTL</a>
@@ -247,12 +249,30 @@
                 </p>
                 <p>
                     Multi-developer teams working on larger applications will
-                    probably find a MVC framework useful.  While both Struts 1 and 2
-                    support JSP, Struts 2.0 has support for JSF and enhanced support
-                    for template languages like Velocity or Freemarker. 
-                    Struts 1.x has a ton of books, articles, and other resources, so it is
-                    the better choice if you need support materials.
+                    probably find a MVC framework useful.  
                 </p>
+
+	<p>
+  	    The original 1.x framework is mature, well-documented, and widely 
+  	    supported. 
+                    Struts 1 is the best choice for teams who value proven solutions.
+ 	    The new Struts 2 framework is the best choice for teams who value 
+                    elegant solutions to difficult problems.               
+                </p>
+                
+                <p>
+                    While both Struts 1 and 2 support JSP and Velocity, 
+                    Struts 2 has better support for JSF and enhanced support
+                    for template languages like Velocity and Freemarker, 
+                    along with optonal plugins for report generators like 
+                    JasperReports.
+                    Both frameworks work well with AJAX, but Struts 2 includes an 
+                    AJAX theme that can give your AJAX pages a boost.
+                    Under the name WebWork, Struts 2 already powers many large 
+                    enterprise-grade solutions, including Atlassian's JIRA and 
+                    Confluence applications.
+                </p> 
+
                 <p>
                     Aside from Apache Struts products, 
                     other likely candidates for a Java Web MVC framework include
@@ -322,7 +342,7 @@
         </faq>
 
         <faq id="steering">
-            <question>Shouldn't the Apache Struts team focus on a single version
+            <question>Shouldn't the Apache Struts Project focus on a single version
                 and help reduce choice for the rest of us?</question>
             <answer>
                 <p>
@@ -331,8 +351,8 @@
                     we want to use to build our own applications. Some of us are
                     working on legacy Struts 1 applications, some of us are working on
                     WebWork 2 or Struts 2 applications, and some of us are working on both. Since we have
-                    volunteers to work on two versions, we offer two
-                    versions.</p>
+                    volunteers to work on two major versions, we offer two
+                    major versions.</p>
 
                 <p>The Struts committers work for different employers all over
                     the world. It is not feasible for us to say this technology or
@@ -347,12 +367,12 @@
                     Entities like Microsoft, and Sun, and Zend, exist to promote one
                     technology over another (mainly to make it easier for them to
                     sell you something)
-                    The Apache Struts team is not trying to sell you anything.
+                    The Apache Struts group is not trying to sell you anything.
                     We're collaborating on the frameworks that we want to use, and
                     we are trying to share the wealth with others who might want to
                     help us.
-                    If you choose to use one of our versions, that's great. We're
-                    glad we could help. If you'd like to help us make the versions
+                    If you choose to use Struts, that's great. We're
+                    glad we could help. If you'd like to help us make Struts
                     even better, feel free to return the favor. We don't want your
                     money, but
                     <a href="helping.html">we could use your help.</a>
@@ -361,7 +381,7 @@
         </faq>
 
             <faq id="subprojects">
-                <question>Why are there so many "extensions" for Struts 1 now?</question>
+                <question>Why are there so many "components" for Struts 1 now?</question>
                 <answer>
                     <p>
                         Over the years, the Struts 1 framework grew to include not only a
@@ -378,9 +398,11 @@
                         Creating the separate distributions created problems of its own, 
                         so for the Struts 1.3.1 build, and beyond, 
                         we are consolidating the extensions back into a single 
-                        Struts 1.3 distribution. Each component has its own                     </p>
-			JAR but all share the same release cycle.
-                </answer>
+                        Struts 1.3 distribution. Each component has its own 
+	        JAR but all share the same release cycle.
+                    </p>
+                 </answer>
+	                        
             </faq>
 
 
@@ -406,13 +428,13 @@
                         business layer framework.
                         The codename for the business layer framework under
                         development is "Nexus".
-                        Like Struts 1.3 and Shale, the Nexus internals are based
+                        Like Struts 1.3 and Apache Shale, the Nexus internals are based
                         on the Chain of Responsibility pattern.
                     </p>
                     <p>
                         OverDrive and Nexus do not complete with frameworks like
-                        Struts 1.3 and Struts 2.
-                        Nexus begins where these frameworks end.
+                        Struts.
+                        Nexus begins where most presentation-layer frameworks end.
                         Nexus is the "rest of the stack".
                     </p>
                     <p>

Modified: struts/site/src/site/xdoc/announce-2005.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/announce-2005.xml?rev=419560&r1=419559&r2=419560&view=diff
==============================================================================
--- struts/site/src/site/xdoc/announce-2005.xml (original)
+++ struts/site/src/site/xdoc/announce-2005.xml Thu Jul  6 07:13:00 2006
@@ -55,6 +55,12 @@
             <h4 id="a20051214.4">14 Dec 2005 - Apache Struts to release Struts
                 1.3.0
                 as the "Action Framework"</h4>
+                
+            <p>
+                [Note: As of version 1.3.5, the "Action Framework" label  
+                was dropped, and Struts is just Struts again.]
+            </p>
+                
             <p>
                 The Apache Struts flagship product,
                 the leading web application framework for Java,
@@ -213,6 +219,11 @@
 
             <h4 id="a20051214.2">14 Dec 2005 - Apache Struts offers "Shale"
                 for JSF</h4>
+                
+            <p>[Note: <a href="http://shale.apache.org/">
+            		Shale is now a top-level ASF project.</a>]
+            </p>
+            
             <p>
                 To give JavaServer Faces developers a head start on building
                 scalable

Modified: struts/site/src/site/xdoc/announce.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/announce.xml?rev=419560&r1=419559&r2=419560&view=diff
==============================================================================
--- struts/site/src/site/xdoc/announce.xml (original)
+++ struts/site/src/site/xdoc/announce.xml Thu Jul  6 07:13:00 2006
@@ -44,43 +44,26 @@
                stable release. As a top-level project, it will be easier for
                Shale to attract new developers and expand its growing community.
             </p>
-            <p>
-               The initial set of PMC members and committers for Shale is:
+
+            
+           <p>
+               The initial set of PMC members and committers for Shale is 
+               Craig McClanahan, James Mitchell, Greg Reddin, Sean Schofield, 
+               Wendy Smoak, Gary VanMatre, Matthias Wessendorf.
             </p>
-            <ul>
-                <li>
-                    Craig McClanahan
-                </li>
-                <li>
-                    James Mitchell
-                </li>
-                <li>
-                    Greg Reddin
-                </li>
-                <li>
-                    Sean Schofield
-                </li>
-                <li>
-                    Wendy Smoak
-                </li>
-                <li>
-                    Gary VanMatre
-                </li>
-                <li>
-                    Matthias Wessendorf
-                </li>
-            </ul>
 
             <p>
                Apache Shale has strong ties to both the Struts and MyFaces
                projects. Most of the Shale PMC members are already involved
-               in both projects, and plan on continuing to remain involved in
+               in both projects and plan on continuing to remain involved in
                them, along with Shale.
             </p>
+
             <p>
                Apache Shale is a modern web application framework, intended for
                developers adopting JavaServer Faces as a core technology.
             </p>
+
             <p>
                Shale began as a proposal for Struts 2.0, but instead became a
                subproject, so as to provide a JSF alternative for Struts
@@ -88,12 +71,20 @@
                easier for Struts developers to access JSF components from within
                an "action-based" application.
             </p>
+
             <p>
                The initial Shale codebase was donated by Craig McClanahan, who
                also donated the original Struts codebase.
             </p>
+            
+            <p>
+            [Note: To accomodate Shale, the original framework had been given 
+            the name "Action". Now that Shale has graduated, the "Action" 
+            label is being dropped, and Struts is just Struts again.]
+            </p>
+
             <hr/>
-        
+
             <h4 id="a20060603.3">03 Jun 2006 - New Struts Committer: 
             	Bob Lee</h4>            
             <p>

Modified: struts/site/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/index.xml?rev=419560&r1=419559&r2=419560&view=diff
==============================================================================
--- struts/site/src/site/xdoc/index.xml (original)
+++ struts/site/src/site/xdoc/index.xml Thu Jul  6 07:13:00 2006
@@ -25,33 +25,97 @@
     <body>
 
         <a name="Welcome"/>
-        <section name="Welcome to Apache Struts!">
+        <section name="Apache Struts">
             <p>
-                Apache Struts is a web development framework based on the "Model 2" approach, a variation of
-                the
-                classic Model-View-Controller (MVC) design paradigm.
-                Under Model 2,
-                a servlet (or equivalent) manages business logic execution,
-                and presentation logic resides mainly in server pages.
+								Apache Struts is a web development framework based on the 
+                classic Model-View-Controller design.
             </p>
 
             <p>
-                The Apache Struts project makes web development easier in two
-                ways.
-                First, by providing an open source framework (briefly known as the 
-                Struts Action Framework)
-                that helps developers build applications for the web.
-                Second, by providing friendly and honest
-                <a href="mail.html">mailing lists</a>
-                where both newcomers and veterans discuss how to use Apache Struts
-                software in their own Model 2 applications.
+                In the Struts framework, requests first pass through an 
+                extensible "front controller". 
+                After pre-processing the request and applying any global 
+                concerns, like logging and security, the controller 
+                selects a handler, or "action". 
+                The action manages the business logic and transfers 
+                control to another resource that will complete the 
+                response, such as a JavaServer Page, Velocity Template, 
+                or PDF report generator. 
+                To close the loop, the framework provides custom tags 
+                that make it easier to access the dynamic data obtained by 
+                the action handler. 
+                The framework's architecture and tags work well with 
+                conventional REST applications, as well as AJAX and SOAP. 
             </p>
-
-            <a name="release"/>
-            <subsection name="Best Available Version">
+            
+            <p>
+            		The project is called Struts because the framework is meant to 
+            		provide the "invisible underpinnings" that support professional 
+            		application development. 
+            		Struts provides the glue that joins the various elements
+            		of the standard Java platform into a coherent whole. 
+            		Our goal is to leverage existing standards by providing the 
+            		missing pieces we need to create enterprise-grade applications 
+            		that are easy to maintain over time. 
+            </p>
+				</section>
+                
+        <a name="Project"/>
+        <section name="The Apache Struts Project">
+        
+        		<p>
+								The Apache Struts Project is the open source community 
+								that creates and maintains the the Apache Struts framework. 
+								The project consists of a diverse group of volunteers who 
+								share common values regarding collaborative, community-based 
+								open source development. 
+								The Apache Struts Project is proud to share these values with 
+								our parent organization: The Apache Software Foundation.								
+						</p>
+						
+						<p>
+
+								The Apache Sruts project offers two major versions of the 
+								Struts framework. <strong>Struts 1.x</strong> is recognized as 
+								<em>the</em> most popular web application framework for Java. 
+								The 1.x framework is mature, well-documented, and widely 
+								supported. 
+								Struts 1 is the best choice for teams who value proven 
+								solutions.
+						</p>
+						
+     				<p>
+              	<strong>Struts 2</strong> is a ground-up rewrite of the original 
+              	action-centric framework.
+                Struts 2 was originally known as 
+                <a href="http://www.opensymphony.com/webwork">WebWork 2</a>. 
+                After working independently for several years, 
+                the WebWork and Struts teams 
+                <a href="announce-2005.html#a20051214.3">joined forces</a>
+                to create Struts 2.
+                The new framework is the best choice for teams who value 
+                elegant solutions to difficult problems. 
+						</p>
+						
+						<p>
+								Struts 2 is still under construction. An initial release is 
+								expected in the third quarter of 2006.
+						</p>
+						
+            <p>
+                For more about the future of Struts, see our
+                <a href="roadmap.html">Roadmap FAQ, </a> especially 
+                <a href="roadmap.html#choice">"What framework should I use for 
+                my next project?".</a>
+             </p>
+			</section>
+			
+			<section>
+            <a name="1.2.9"/>
+            <subsection name="Struts 1.2.9 released">
 
                 <p>
-                    The best available version is
+                    The best available version of Struts is
                     <a href="announce.html#a20050322">
                         <strong>Struts 1.2.9,</strong>
                     </a>
@@ -65,79 +129,22 @@
 
             </subsection>
             
-            <a name="shale"/>
-            <subsection name="What Happened to Struts Shale?">
-                <p>
-                    <a href="http://struts.apache.org/struts-shale">Struts Shale</a>
-                    started as a Struts subproject, but
-                    later <a href="announce.html#a20060628.1">graduated</a>
-                    to a full top level Apache project.  Apache Shale, as it is now
-                    called, builds on JavaServer Faces (JSF), making JSF applications easier to 
-                    develop.  Until the new Apache Struts project gets established, its pages
-                    are still located at 
-                    <a href="http://struts.apache.org/struts-shale">http://struts.apache.org/struts-shale/</a>.
-                </p>
-            </subsection>
-            
-            <a name="cooking"/>
-            <subsection name="What's Cooking?">
+        </section>
 
+        <section>
+            <a name="shale"/>
+            <subsection name="Hey! What Happened to Struts Shale?">
                 <p>
-                    The Apache Struts project is now comprised of two distinct
-                    versions of the Struts framework.
-                    The two versions are 
-                    <strong>Struts 1</strong>
-                    and the
-                    <strong>Struts 2.</strong>
-                    Struts 1 is the original request-based framework that has a large and 
-                    active following.  Struts 2
-                    started with a merger with the <a href="http://www.opensymphony.com/webwork">
-                    Opensymphony WebWork</a> project and aims to exploit Java 5 annotations
-                    and other modern web framework features in an effort to make Struts easier to
-                    use and more powerful. Both versions are actively developed and supported by
-                    the Apache Struts project.
-                </p>
-                
-                <p>
-                    Whether you are staying the course, or ready to leap forward,
-                    the Apache Struts project is here to help you do what you want
-                    to do.
-                </p>
-
-                <p>
-                    For more, see our
-                    <a href="roadmap.html">Roadmap FAQ, </a> especially 
-                    <a href="roadmap.html#choice">What should I use for my next project?</a>.
-                </p>
-            </subsection>
-
-            <a name="about"/>
-            <subsection name="About Apache Struts">
-                <p>
-                    Apache Struts is a volunteer project and
-                    all support for the framework is provided by unpaid
-                    volunteers.
-                    The documentation bundled with each release and the mailing 
-                    lists are the primary ways to learn how to use the software.
-                    The next few pages are devoted to helping everyone understand
-                    what support resources are available.
-                    Since Apache Struts is a volunteer project,
-                    and our resources are limited,
-                    it is important that we first help you help yourself.
+                    <a href="http://struts.apache.org/struts-shale">Struts 
+                    Shale</a>
+                    started as an Apache Struts subproject and then 
+                    <a href="announce.html#a20060628.1">graduated</a>
+                    to a full top-level Apache project in its own right.  
+                    Apache Shale builds on JavaServer Faces (JSF), making JSF 
+                    applications easier to develop. For details, visit the 
+                    <a href="http://shale.apache.org">Apache Shale</a> 
+                    site.
                 </p>
-
-                <ul>
-                    <li>
-                        Struts is a project of the
-                        <a href="http://www.apache.org">
-                            The Apache Software Foundation.</a>
-                    </li>
-                    <li>
-                        The official Apache Struts home page is at
-                        <a href="http://struts.apache.org/">
-                            http://struts.apache.org/.</a>
-                    </li>
-                </ul>
             </subsection>
         </section>
 

Modified: struts/site/src/site/xdoc/mail.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/mail.xml?rev=419560&r1=419559&r2=419560&view=diff
==============================================================================
--- struts/site/src/site/xdoc/mail.xml (original)
+++ struts/site/src/site/xdoc/mail.xml Thu Jul  6 07:13:00 2006
@@ -68,26 +68,38 @@
                         questions and
                         comments about the actual software source code and
                         general
-                        "development" types of questions.
+                        "development" types of questions. 
+                        Questions about the "future" of Struts are 
+                        best addressed to the dev list.
                     </li>
                 </ul>
 
-                <p>Some questions are appropriate for posting on both the
+                <p>Some questions may seem appropriate for posting on both the
                     "user" and
-                    the "developer" lists. In this case, pick one and only
-                    one. Do not
-                    cross post.</p>
+                    the "developer" lists. 
+                    In this case, pick one and only one. 
+                    Do not cross post, unless a Committer asks that the 
+                    thread be moved to the other list.
+                </p>
 
                 <p>Asking a configuration question on the developers list is
-                    frowned
-                    upon because developers' time is as precious as yours. By
-                    contacting
-                    them directly instead of the user base you are abusing
-                    resources. In
-                    fact, it is unlikely that you will get a quicker answer,
-                    if at
-                    all.</p>
-
+                    discouraged because the time of our developers is as 
+                    precious as yours. 
+                    By contacting the developers directly instead of the user 
+                    base you are abusing resources. 
+                    In fact, it is unlikely that you will get a quicker answer,
+                    if any answer at all 
+                </p>
+                
+                <p>
+                	Conversely, a question about the future of Struts 
+                	or the operation of the Struts project is best posted to the 
+	                dev list. 
+	                The focus of the user list should be one "how" to do 
+	                something with the framework we have today. 
+	                The focus of the dev list is how we want to do something 
+	                with a future version of the framework. 
+                </p>
                 <p>
                     <strong>
                         Join the lists that are appropriate for your
@@ -131,10 +143,8 @@
                     essay entitled
                     <a
                             href="http://www.catb.org/~esr/faqs/smart-questions.html">
-                        "
-                        <strong>Asking
-                            Smart Questions</strong>
-                        "
+                        <strong>"Asking
+                            Smart Questions"</strong>
                     </a>
                     precisely on this topic.
                 </p>

Modified: struts/site/src/site/xdoc/volunteers.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/volunteers.xml?rev=419560&r1=419559&r2=419560&view=diff
==============================================================================
--- struts/site/src/site/xdoc/volunteers.xml (original)
+++ struts/site/src/site/xdoc/volunteers.xml Thu Jul  6 07:13:00 2006
@@ -28,7 +28,7 @@
             <a name="statistics"/>
             <subsection name="List Subscribers and Downloads">
 
-                <p>In July 2005, there were more than 2800 subscribers to
+                <p>In July 2006, there were more than 2800 subscribers to
                     STRUTS-USER (including the digest version). In addition to
                     the
                     regular subscribers, an unknown number of developers read