You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by hu...@apache.org on 2005/11/17 12:38:14 UTC

svn commit: r345227 - in /struts: core/trunk/xdocs/ core/trunk/xdocs/faqs/ site/trunk/xdocs/

Author: husted
Date: Thu Nov 17 03:37:57 2005
New Revision: 345227

URL: http://svn.apache.org/viewcvs?rev=345227&view=rev
Log:
Continue final pass for 1.3.x release. 

Modified:
    struts/core/trunk/xdocs/faqs/actionForm.xml
    struts/core/trunk/xdocs/faqs/apps.xml
    struts/core/trunk/xdocs/faqs/db-howto.xml
    struts/core/trunk/xdocs/faqs/eclipse.xml
    struts/core/trunk/xdocs/faqs/index.xml
    struts/core/trunk/xdocs/faqs/navigation.xml
    struts/core/trunk/xdocs/faqs/netbeans40.xml
    struts/core/trunk/xdocs/faqs/newbie.xml
    struts/core/trunk/xdocs/faqs/works.xml
    struts/core/trunk/xdocs/index.xml
    struts/core/trunk/xdocs/learning.xml
    struts/core/trunk/xdocs/milestones.xml
    struts/core/trunk/xdocs/navigation.xml
    struts/core/trunk/xdocs/roadmap.xml
    struts/site/trunk/xdocs/bylaws.xml
    struts/site/trunk/xdocs/index.xml
    struts/site/trunk/xdocs/javadoc.xml
    struts/site/trunk/xdocs/navigation.xml

Modified: struts/core/trunk/xdocs/faqs/actionForm.xml
URL: http://svn.apache.org/viewcvs/struts/core/trunk/xdocs/faqs/actionForm.xml?rev=345227&r1=345226&r2=345227&view=diff
==============================================================================
--- struts/core/trunk/xdocs/faqs/actionForm.xml (original)
+++ struts/core/trunk/xdocs/faqs/actionForm.xml Thu Nov 17 03:37:57 2005
@@ -30,7 +30,7 @@
 
     <p>
     This is a simple example of a login form to illustrate how Struts
-    Core makes dealing with forms much less painful than using straight HTML
+    Action Framework makes dealing with forms much less painful than using straight HTML
     and standard JSP facilities.  
     Consider the following page (based on the Struts MailReader, found in 
     the Application subproject) named <code>logon.jsp</code>:
@@ -94,7 +94,7 @@
 <hr/>
 
     <p>
-    The following items illustrate the key features of form handling in Struts Core,
+    The following items illustrate the key features of form handling,
     based on this example:
     </p>
 
@@ -167,7 +167,7 @@
         configuration.
         The <code>logon</code> mapping tells the tag that the form bean is
         stored in the session context under the key <code>logonForm</code>.
-        The Struts Core developer provides the Java implementation of the 
+        The developer provides the Java implementation of the 
         ActionForm bean, subclassing the Struts class <code>ActionForm</code>
         (see <a href="../userGuide/building_controller.html#4_3_ActionForm_Classes">Building
         Controller</a> components).

Modified: struts/core/trunk/xdocs/faqs/apps.xml
URL: http://svn.apache.org/viewcvs/struts/core/trunk/xdocs/faqs/apps.xml?rev=345227&r1=345226&r2=345227&view=diff
==============================================================================
--- struts/core/trunk/xdocs/faqs/apps.xml (original)
+++ struts/core/trunk/xdocs/faqs/apps.xml Thu Nov 17 03:37:57 2005
@@ -26,7 +26,7 @@
 <subsection name="About This Document">
 <p>
 This document outlines one possible sequence of development steps that can be followed to create a
-Struts Core application.  It is not intended as a complete description of each
+Struts Action Framework application.  It is not intended as a complete description of each
 referenced development activity.  More detailed documentation is available
 elsewhere and is referenced by "(more...)" links where possible.
 </p>
@@ -35,8 +35,8 @@
 <subsection name="Caveats">
 <ol>
 <li>Requirements development and design are outside of the scope of this  document.</li>
-<li>For help installing Struts Core, see the <a href="../userGuide/installation.html">Getting Started</a> chapter.</li>
-<li>There are many other ways to approach Struts Core development and there are many
+<li>For help installing the framework, see the <a href="../userGuide/installation.html">Getting Started</a> chapter.</li>
+<li>There are many other ways to approach development with the framework and there are many
     other features available besides the ones discussed below. This document
     outlines only one way to get started.</li>
 <li>This document focuses on form/data centric applications, but may also work with
@@ -57,7 +57,7 @@
 <li>Create <code>struts-config.xml</code> to associate forms with
     actions.</li>
 <li>Create or update <code>web.xml</code> to reference
-    <code>ActionServlet</code>, taglibs used by Struts Core.</li>
+    <code>ActionServlet</code>, taglibs used by the framework.</li>
 <li>Parallel Tasks
 <ol>
 <li>Building</li>

Modified: struts/core/trunk/xdocs/faqs/db-howto.xml
URL: http://svn.apache.org/viewcvs/struts/core/trunk/xdocs/faqs/db-howto.xml?rev=345227&r1=345226&r2=345227&view=diff
==============================================================================
--- struts/core/trunk/xdocs/faqs/db-howto.xml (original)
+++ struts/core/trunk/xdocs/faqs/db-howto.xml Thu Nov 17 03:37:57 2005
@@ -92,10 +92,10 @@
     </p>
 
     <p>
-    Using fewer Actions does require a deeper understanding of how Struts Core 
+    Using fewer Actions does require a deeper understanding of how Struts  
     and MVC frameworks operate.
     Don't hesitate to err on the side of creating more Action classes at first.
-    The Struts Core configuration makes it easy to refactor your Actions later,
+    The configuration file makes it easy to refactor your Actions later,
     since you can change the Action type without changing anything else in the
     application.
     </p>

Modified: struts/core/trunk/xdocs/faqs/eclipse.xml
URL: http://svn.apache.org/viewcvs/struts/core/trunk/xdocs/faqs/eclipse.xml?rev=345227&r1=345226&r2=345227&view=diff
==============================================================================
--- struts/core/trunk/xdocs/faqs/eclipse.xml (original)
+++ struts/core/trunk/xdocs/faqs/eclipse.xml Thu Nov 17 03:37:57 2005
@@ -20,17 +20,17 @@
 <document>
 
 <properties>
-  <title>How to setup a basic Struts Core project using Eclipse IDE</title>
+  <title>How to setup a basic Struts Action Framework project using Eclipse IDE</title>
 </properties>
 
 <body>
 
-<section name="How to setup a basic Struts Core project using Eclipse IDE">
+<section name="How to setup a basic Struts Action Framework project using Eclipse IDE">
 <subsection name="Legal Disclamer">
 
 <p>
 * DISCLAIMER - This simple How-To shows you one of many ways to setup a working project using<br/>
-the Struts Core framework.  This is mainly geared toward Struts users who are new to Eclipse, and<br/> 
+the Struts Action framework.  This is mainly geared toward Struts users who are new to Eclipse, and<br/> 
 don't want to spend a lot of time figuring out the differences between their old IDE (if any)<br/>
 and this one.<br/>
 <br/>

Modified: struts/core/trunk/xdocs/faqs/index.xml
URL: http://svn.apache.org/viewcvs/struts/core/trunk/xdocs/faqs/index.xml?rev=345227&r1=345226&r2=345227&view=diff
==============================================================================
--- struts/core/trunk/xdocs/faqs/index.xml (original)
+++ struts/core/trunk/xdocs/faqs/index.xml Thu Nov 17 03:37:57 2005
@@ -41,7 +41,7 @@
     </li>
 
      <li>
-     <a href="works.html">How does Struts Core work?</a>
+     <a href="works.html">How does it work?</a>
      </li>
 
  </ul>

Modified: struts/core/trunk/xdocs/faqs/navigation.xml
URL: http://svn.apache.org/viewcvs/struts/core/trunk/xdocs/faqs/navigation.xml?rev=345227&r1=345226&r2=345227&view=diff
==============================================================================
--- struts/core/trunk/xdocs/faqs/navigation.xml (original)
+++ struts/core/trunk/xdocs/faqs/navigation.xml Thu Nov 17 03:37:57 2005
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<project 
-    name="Struts Core"
-    href="http://struts.apache.org/faqs"
-    image="images/struts.gif"
-    authors="true">
+<project name="Struts Action Framework">
 
-  <title>Apache Struts - Struts Core - FAQs and HOWTOs</title>
+  <title>Apache Struts - Struts Action Framework - FAQs and HOWTOs</title>
   <body>
     <menu name="FAQs">
         <item 
@@ -54,7 +50,7 @@
             name="Source Repository"
             href="http://svn.apache.org/viewcvs.cgi/struts/core/trunk/?root=Apache-SVN"/>
         <item 
-            name="Struts Core Home"
+            name="Struts Action Home"
             href="index.html"/>
     </menu>
   </body>

Modified: struts/core/trunk/xdocs/faqs/netbeans40.xml
URL: http://svn.apache.org/viewcvs/struts/core/trunk/xdocs/faqs/netbeans40.xml?rev=345227&r1=345226&r2=345227&view=diff
==============================================================================
--- struts/core/trunk/xdocs/faqs/netbeans40.xml (original)
+++ struts/core/trunk/xdocs/faqs/netbeans40.xml Thu Nov 17 03:37:57 2005
@@ -20,7 +20,7 @@
 <document>
 
 <properties>
- <title>How to setup a basic Struts project using NetBeans IDE 4.0</title>
+ <title>How to setup a basic Struts Action Framework project using NetBeans IDE 4.0</title>
 </properties>
 
 <body>
@@ -32,7 +32,7 @@
 <p>
 * DISCLAIMER - This simple How-To shows you how easy it is to use NetBeans IDE 4.0 to write code for the Struts<br/>
 framework.  It just works straight out of the box. Simply specify where your sources are<br/>
-and where you want to store your Struts Core application, and NetBeans IDE 4.0 does everything<br/>
+and where you want to store your application, and NetBeans IDE 4.0 does everything<br/>
 you need -- it even generates a customized Ant build script for you and hooks its targets<br/>
 up to IDE commands such as "Build" and "Run".<br/>
 <br/>
@@ -109,8 +109,8 @@
 
 </section>
 
-<section name="Let's set up a blank Struts Core application">
-Now you will use wizards to set up a new Struts application in NetBeans IDE 4.0, again in 5 steps.<br/> 
+<section name="Let's set up a blank application">
+Now you will use wizards to set up a new Struts Action Framework application in NetBeans IDE 4.0, again in 5 steps.<br/> 
 <br/>
 <ol>
   <li>

Modified: struts/core/trunk/xdocs/faqs/newbie.xml
URL: http://svn.apache.org/viewcvs/struts/core/trunk/xdocs/faqs/newbie.xml?rev=345227&r1=345226&r2=345227&view=diff
==============================================================================
--- struts/core/trunk/xdocs/faqs/newbie.xml (original)
+++ struts/core/trunk/xdocs/faqs/newbie.xml Thu Nov 17 03:37:57 2005
@@ -29,7 +29,7 @@
 
     <p>
     Here are answers to the most common questions people ask when using
-    Struts Core on their first project.
+    the framework on their first project.
     </p>
 
     <ul>
@@ -114,7 +114,7 @@
 <subsection name="What is a modular application? What does module-relative mean?">
 
 <p>
-Since Struts 1.1, the Core framework supports multiple application modules. All applications have at
+Since Struts 1.1, the framework supports multiple application modules. All applications have at
 least one root, or default, module. Like the root directory in a file system, the default application
 has no name. (Or is named with an empty string, depending your viewpoint.) Developing an application
 with only a default module is no different from how applications were developed under Struts 1.0.
@@ -128,7 +128,7 @@
 </p>
 
 <p>
-But to answer the question =:0), a modular application is a Struts Core application that uses more than
+But to answer the question =:0), a modular application is an application that uses more than
 one module. Module-relative means that the URI starts at the module level, rather than at
 the context level, or the absolute-URL level.
 </p>
@@ -180,7 +180,7 @@
 Since then, most developers use different approaches to data persistent,
 and most developers now have a good understanding of why we want to separate 
 the model from the view. 
-Accordingly, we do plan to introduce more interfaces into Struts Core. 
+Accordingly, we do plan to introduce more interfaces into the framework. 
 It's just a matter of when. 
 </p>
 <p>
@@ -194,8 +194,8 @@
 <a name="JavaBeans"/>
 <subsection name="Do ActionForms have to be true JavaBeans?">
 <p>
-The utilities that Struts Core uses (Commons-BeanUtils since 1.1) require that ActionForm properties follow
-the JavaBean patterns for mutators and accessors (get*,set*,is*). Since Struts Core uses the Introspection API
+The utilities that the framework uses (Commons-BeanUtils since 1.1) require that ActionForm properties follow
+the JavaBean patterns for mutators and accessors (get*,set*,is*). Since the framework uses the Introspection API
 with the ActionForms, some containers may require that all the JavaBean patterns be followed, including
 declaring "<code>implements Serializable</code>" for each subclass. The safest thing is to review the
 <a href="../userGuide/preface.html#javabeans">JavaBean specification</a> and follow all the prescribed patterns.
@@ -226,7 +226,7 @@
     </ul>
     <p>
     ActionForms (a.k.a. "form beans") are really just Java beans (with a few
-    special methods) that Struts Core creates and puts into session or request scope for you.
+    special methods) that the framework creates and puts into session or request scope for you.
     There is nothing preventing you from using other beans, or including
     them in your form beans. Here are some examples:
     </p>
@@ -347,10 +347,10 @@
     rules.</p>
 
     <p>First, your ActionForm bean must have a zero-arguments
-    constructor.  This is required because Struts Core must be able to
+    constructor.  This is required because the framework must be able to
     dynamically create new instances of your form bean class, while
     knowing only the class name.  This is not an onerous restriction,
-    however, because Struts Core will also populate your form bean's
+    however, because the framework will also populate your form bean's
     properties (from the request parameters) for you.</p>
 
     <p>Second, the fields of your form bean are made available to the
@@ -411,8 +411,8 @@
 
     <p>There are other rules to follow if you want other features of your
     form beans to be exposed.  These include indexed attributes and mapped
-    attributes.  They are covered in detail in other areas of the Struts
-    Core documentation, in particular:</p>
+    attributes.  They are covered in detail in other areas of the 
+    documentation, in particular:</p>
     
     <a href="indexedprops.html">indexedprops.html</a>
     
@@ -458,7 +458,7 @@
         undisplayed boolean properties will always appear to have a
         <code>false</code> value.</li>
     <li><em>Workflow</em> - The most common need for form bean
-        reuse is workflow.  Out of the box, Struts Core has limited support
+        reuse is workflow.  Out of the box, the framework has limited support
         for workflow, but a common pattern is to use a single form bean
         with all of the properties for all of the pages of a workflow.
         You will need a good understanding of the
@@ -483,8 +483,8 @@
     <code>Action</code> would then be use to process the submitted form fields,
     by declaring an instance of the same form bean name.</p>
 
-    <p>The <em>struts-example</em> example application that is shipped
-    with Struts Core illustrates this design pattern nicely.  Note the following
+    <p>The <em>MailReader</em> application, part of the Struts Applications
+    subrpoject, illustrates this design pattern nicely.  Note the following
     definitions from the <code>struts-config.xml</code> file:</p>
     <pre>
         ...
@@ -519,8 +519,8 @@
     <ul>
     <li>Both the <code>/editRegistration</code> and
         <code>/saveRegistration</code> actions use the same form bean.</li>
-    <li>When the <code>/editRegistration</code> action is entered, Struts
-        Core will have pre-created an empty form bean instance, and passed it to
+    <li>When the <code>/editRegistration</code> action is entered, the 
+        framework will have pre-created an empty form bean instance, and passed it to
         the <code>execute()</code> method.  The setup action is free to
         preconfigure the values that will be displayed when the form is
         rendered, simply by setting the corresponding form bean properties.
@@ -535,13 +535,13 @@
         validation on the form that is being set up.  You will normally want
         to include this attribute in the configuration of your setup actions,
         because you are not planning to actually process the results -- you
-        simply want to take advantage of the fact that Struts Core will precreate
+        simply want to take advantage of the fact that the framework will precreate
         a form bean instance of the correct class for you.</li>
     <li>The processing action (<code>/saveRegistration</code>), on the other
         hand, leaves out the <code>validate</code> attribute, which defaults
-        to <code>true</code>.  This tells Struts Core to perform the validations
+        to <code>true</code>.  This tells the framework to perform the validations
         associated with this form bean before invoking the processing action
-        at all.  If any validation errors have occurred, Struts Core will forward
+        at all.  If any validation errors have occurred, the framework will forward
         back to your input page (technically, it forwards back to an
         <code>ActionForward</code> named "registration" in this case, because
         the example webapp uses the <code>inputForward</code> attribute in the
@@ -668,7 +668,7 @@
 and things that make sense for the particular problem you are triing to
 solve.</p>
 <p>
-... This is where Struts Core comes into the picture, by now the system should be
+... This is where the framework comes into the picture, by now the system should be
 pretty well bulletproof.  What we are going to do is make validation friendlier
 and informative.  Rember it is OK to have duplicate validations...</p>
 <p>
@@ -707,7 +707,7 @@
     <p>
     The simplest way is to have two actions.  The first one has the job of setting
     the form data, i.e. a blank registration screen.  The second action in our
-    writes the registration data to the database. Struts Core 
+    writes the registration data to the database. The framework  
     would take care of invoking the validation and returning the user to the
     correct screen if validation was not complete.
     </p>
@@ -925,7 +925,7 @@
     calling the second Action from the first Action has the same effect as calling the second
     Action from scratch.
     If both of your Actions change the properties of a formbean,
-    the changes made by the first Action will be lost because Struts Core calls the reset() method on
+    the changes made by the first Action will be lost because the framework calls the reset() method on
     the formbean when the second Action is called.
         </p>
 

Modified: struts/core/trunk/xdocs/faqs/works.xml
URL: http://svn.apache.org/viewcvs/struts/core/trunk/xdocs/faqs/works.xml?rev=345227&r1=345226&r2=345227&view=diff
==============================================================================
--- struts/core/trunk/xdocs/faqs/works.xml (original)
+++ struts/core/trunk/xdocs/faqs/works.xml Thu Nov 17 03:37:57 2005
@@ -19,22 +19,22 @@
 <document>
 
 <properties>
-<title>How Does Struts Core Work?</title>
+<title>How Does It Work?</title>
 </properties>
 <body>
-<section href="faq" name="How does Struts Core work?">
+<section href="faq" name="How does it work?">
 
-<subsection href="how" name="How Does Struts Core Work?">
+<subsection href="how" name="How does it work?">
 
 <p>
     Java Servlets are designed to handle requests made by Web browsers.
     Server pages are designed to create dynamic Web pages that can turn billboard sites into live applications.
-    Struts Core uses a special Servlet as a switchboard to route requests from Web browsers to the appropriate server page.
+    Struts Action Framework uses a special Servlet as a switchboard to route requests from Web browsers to the appropriate server page.
     This makes Web applications much easier to design, create, and maintain.
 </p>
 
 <p>
-    Here is some more detail on the mechanisms and dependencies of Struts Core:
+    Here is some more detail on the mechanisms and dependencies of the framework:
 </p>
 
 <ul>
@@ -46,7 +46,7 @@
       mappings to servlets (path or extension name), and parameters to those
       servlets.<br/>
 
-      In this file, you configure the Struts Core 
+      In this file, you configure the framework  
       <a href="../apidocs/org/apache/struts/action/ActionServlet.html"><code>ActionServlet</code></a>
       as the servlet that will handle all requests for a given mapping (usually
       the extension <code>.do</code>). This is the "switchboard" mentioned
@@ -63,7 +63,7 @@
       <a href="http://java.sun.com">Java site</a>.<br/>
    </li>
    <li>
-      In the Struts Core configuration file(s), you associate paths with
+      In the framework configuration file(s), you associate paths with
       the controller components of your application, known as
       <a href="../api/org/apache/struts/action/Action.html"><code>Action</code></a>
       classes (i.e. "login" ==&gt; LoginAction class). This tells the 
@@ -78,7 +78,7 @@
       executed.<br/>
    </li>
    <li>
-      For each <code>Action</code>, you also configure Struts Core with the names of
+      For each <code>Action</code>, you also configure the framework with the names of
       the resulting page(s) that can be shown as a result of that action. There
       can be more than one view as the result of an action (often, there are at
       least two: one for success, and one for failure).<br/>
@@ -86,19 +86,19 @@
       Your <code>Action</code> (the controller component you write) is based on
       these <em>logical</em> result mapping names. It reports back to the
       <code>ActionServlet</code> using words like "success", "failure",
-      "ready", "ok", "UserError", et cetera. Struts Core (through the
+      "ready", "ok", "UserError", et cetera. The framework (through the
       configuration that you wrote) knows how to forward to the proper
       <em>specific</em> page. This has the added advantage of reconfiguration of
       the view layer by simply editing the XML configuration file.<br/>
 
-      At this point Struts Core knows how to delegate to your controller components,
+      At this point, the framework knows how to delegate to your controller components,
       and what to show as a result of your controller processing. The "model"
       part of the application is completely up to you, and is called from
       within your controller components.
    </li>
    <li>
       You may also associate a Java Bean with an action (or set of actions) in
-      the Struts Core configuration file. The Java Bean is used as a repository for
+      the framework's configuration file. The Java Bean is used as a repository for
       form or display data that can be communicated between the view and
       controller layer.<br/>
 
@@ -106,29 +106,29 @@
       (like <code>LoginAction</code>) and any view page that is associated with
       that controller. <br/>
 
-      These Beans can also be validated with the help of Struts Core to
+      These Beans can also be validated with the help of the framework to
       help insure that the user is putting good data in the form. They can be
       carried along with a session, allowing forms to span multiple pages of
       the view, and Actions in the controller.<br/>
 
       <strong>Note</strong>: You must be using some sort of server-side
       technology (JSP, Velocity, XSLT) for the view layer (going <em>to</em> the
-      client) to see this data (plain HTML won't work). Struts Core works on the
+      client) to see this data (plain HTML won't work). The framework works on the
       server side, so the client's view has to be composed there.<br/>
 
       The client feeds the data back through normal form submission (POST/GET)
-      methods, and Struts Core updates that data in the Bean before
+      methods, and the framework updates that data in the Bean before
       calling your controller components.
    </li>
    <li>
       Within your web application will be pages that represent the view your
       users will see. These can be JSP pages, Velocity Templates,
       XSLT pages, and so forth.
-      Sets of JSP and JSTL tags are available for Struts Core so that you
+      Sets of JSP and JSTL tags are available for the framework so that you
       can get started right away, but any standard presentation technology
-      can be used with Struts Core.<br/>
+      can be used with the framework.<br/>
 
-      Even plain HTML files can be used within your Struts Core application,
+      Even plain HTML files can be used within your application,
       although they will not take full advantage of all of the dynamic
       features.<br/>
 

Modified: struts/core/trunk/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/struts/core/trunk/xdocs/index.xml?rev=345227&r1=345226&r2=345227&view=diff
==============================================================================
--- struts/core/trunk/xdocs/index.xml (original)
+++ struts/core/trunk/xdocs/index.xml Thu Nov 17 03:37:57 2005
@@ -42,9 +42,9 @@
 <a name="nutshell"/>
 
     <p>
-        Action Framework provides its own web <strong>Controller</strong> component and
+        The framework provides its own web <strong>Controller</strong> component and
         integrates with other technologies to provide the Model and the View.
-        For the <strong>Model</strong>, Core can interact
+        For the <strong>Model</strong>, the framework 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>,
@@ -53,7 +53,7 @@
         <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
+        For the <strong>View</strong>, the framework 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
@@ -63,7 +63,7 @@
     </p>
     
     <p>
-    	The Action Framework Controller acts as a bridge between the application's 
+    	The framework's Controller acts as a bridge between the application's 
     	Model and the web View. When a request is received, the Controller invokes 
     	an <strong>Action</strong> class. The Action class consults with the Model 
     	(or, preferably, a <strong>Facade</strong> representing your Model) 
@@ -175,7 +175,7 @@
      </p>
 
     <p>
-        For more about Struts Action Framework and its underlying technologies, see the
+        For more about the framework and its underlying technologies, see the
         <a href="userGuide/index.html">User Guide</a>.
     </p>
 
@@ -193,7 +193,7 @@
     <p>
         But, if you are writing a more complicated application,
         with dozens of pages,
-        that need to be maintained over time, then Struts Core can help.
+        that need to be maintained over time, then Struts Action Framework can help.
         For more about whether Model 1 or MVC/Model 2 is right for you, see
         <a href="http://www.javaworld.com/javaworld/jw-12-1999/jw-12-ssj-jspmvc.html">
         Understanding JavaServer Pages Model 2 architecture</a> and

Modified: struts/core/trunk/xdocs/learning.xml
URL: http://svn.apache.org/viewcvs/struts/core/trunk/xdocs/learning.xml?rev=345227&r1=345226&r2=345227&view=diff
==============================================================================
--- struts/core/trunk/xdocs/learning.xml (original)
+++ struts/core/trunk/xdocs/learning.xml Thu Nov 17 03:37:57 2005
@@ -28,7 +28,7 @@
 <section name="Learning About Struts Action Framework">
 
     <p>
-        The <strong>official documentation</strong> for Struts Action Framework is
+        The <strong>official documentation</strong> for the framework is
         provided online and may be built locally from the source code
         distribution.
         To build the documentation, change to the subproject's
@@ -77,7 +77,7 @@
         User Guide</strong></a>
         introduces the Model-View-Controller architecture,
         and how it relates to the major components of the framework.
-        If you want to find out "How Struts Action works", this is the place to start.
+        If you want to find out "How it works", this is the place to start.
         Along with an architectural overview,
         the User Guide also includes detailed installation instructions
         and release notes for each version of the framework.
@@ -156,7 +156,7 @@
 
     <ul>
         <li>
-            Blank - A simple template for starting new Struts applications.
+            Blank - A simple template for starting new applications.
         </li>
          <li>
             Cookbook - See various techniques in action and view the source code in place. 

Modified: struts/core/trunk/xdocs/milestones.xml
URL: http://svn.apache.org/viewcvs/struts/core/trunk/xdocs/milestones.xml?rev=345227&r1=345226&r2=345227&view=diff
==============================================================================
--- struts/core/trunk/xdocs/milestones.xml (original)
+++ struts/core/trunk/xdocs/milestones.xml Thu Nov 17 03:37:57 2005
@@ -90,7 +90,7 @@
                         Divide distribution into subprojects
                         <ul>
                             <li>
-                                core, apps, el, faces, site, taglibs, extras
+                                action, apps, el, faces, site, taglibs, extras
                             </li>
                             <li>
                                 flow, scripting, shale
@@ -101,7 +101,7 @@
                         Complete support for Maven builds
                     </li>
                     <li>
-                        Move core to "Struts Chain" Request Processor
+                        Move action to "Struts Chain" Request Processor
                     </li>
                     <li>
                         Enhance all configs to extend one configuration
@@ -119,7 +119,7 @@
                     <li>
                         (Pending) Bundle subproject GA releases into
                         Linux-style  distributions
-                        (Struts Classic 1.3.0 = (Core 1.3.x + Taglibs 1.3.x +
+                        (Struts Classic 1.3.0 = (Action 1.3.x + Taglibs 1.3.x +
                         Extras 1.3.x))
                     </li>
                 </ul>

Modified: struts/core/trunk/xdocs/navigation.xml
URL: http://svn.apache.org/viewcvs/struts/core/trunk/xdocs/navigation.xml?rev=345227&r1=345226&r2=345227&view=diff
==============================================================================
--- struts/core/trunk/xdocs/navigation.xml (original)
+++ struts/core/trunk/xdocs/navigation.xml Thu Nov 17 03:37:57 2005
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="Struts Core">
-<title>Apache Struts - Struts Core</title>
+<project name="Struts Action Framework">
+<title>Apache Struts - Struts Action Framework</title>
     <body>
 
-        <menu name="Struts Core Framework">
+        <menu name="Struts Action Framework">
             <item
                 name="Welcome"
                 href="index.html"

Modified: struts/core/trunk/xdocs/roadmap.xml
URL: http://svn.apache.org/viewcvs/struts/core/trunk/xdocs/roadmap.xml?rev=345227&r1=345226&r2=345227&view=diff
==============================================================================
--- struts/core/trunk/xdocs/roadmap.xml (original)
+++ struts/core/trunk/xdocs/roadmap.xml Thu Nov 17 03:37:57 2005
@@ -195,7 +195,7 @@
         <p>
             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
+            the framework 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,
@@ -298,7 +298,7 @@
             Depending on how the work goes with the experimental
             ActionCommand interface,
             we might identifiy a need to add a catalog element to the
-            Struts Core configuration,
+            configuration,
             to support using a Chain of ActionCommands.
         </p>
 
@@ -434,12 +434,12 @@
     </ul>
 
     <p>
-        A strong goal should be that a Struts Core application should be
+        A strong goal should be that an application should be
         usable either as a webapp or as a portlet,
         with little (ideally no) changes.
         Therefore, we should build whatever it takes to support this into
-        the standard Struts Core distribution,
-        which woulf then be used in both environments.
+        the standard framework distribution,
+        which could then be used in both environments.
     </p>
 
 </subsection>

Modified: struts/site/trunk/xdocs/bylaws.xml
URL: http://svn.apache.org/viewcvs/struts/site/trunk/xdocs/bylaws.xml?rev=345227&r1=345226&r2=345227&view=diff
==============================================================================
--- struts/site/trunk/xdocs/bylaws.xml (original)
+++ struts/site/trunk/xdocs/bylaws.xml Thu Nov 17 03:37:57 2005
@@ -115,7 +115,7 @@
 
     <p>
     Subprojects are the Project's unit of release. Each subproject should
-    represent an implementation of the Struts core or a related component.
+    represent an implementation of a Struts framework or a related component.
     Each subproject should focus on creating, maintaining, and releasing a
     single software product or "deliverable".
     </p>

Modified: struts/site/trunk/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/struts/site/trunk/xdocs/index.xml?rev=345227&r1=345226&r2=345227&view=diff
==============================================================================
--- struts/site/trunk/xdocs/index.xml (original)
+++ struts/site/trunk/xdocs/index.xml Thu Nov 17 03:37:57 2005
@@ -158,7 +158,7 @@
     </p>
 
     <p>	
-	To make the Struts Action Framework easier to maintain, 
+	To make the Struts Action Framework easier for us to maintain, 
 	we've subdivided the original monolithic distribution into several subprojects. 
 	Each subproject has its own website, documentation, and release cycle, 
 	and may be downloaded separately. 

Modified: struts/site/trunk/xdocs/javadoc.xml
URL: http://svn.apache.org/viewcvs/struts/site/trunk/xdocs/javadoc.xml?rev=345227&r1=345226&r2=345227&view=diff
==============================================================================
--- struts/site/trunk/xdocs/javadoc.xml (original)
+++ struts/site/trunk/xdocs/javadoc.xml Thu Nov 17 03:37:57 2005
@@ -28,10 +28,7 @@
 <section name="Javadoc">
   <table>
     <tr>
-      <th><a href="struts-core/apidocs/index.html">Struts Core</a></th>
-    </tr>
-    <tr>
-      <th><a href="struts-taglib/apidocs/index.html">Struts Taglibs</a></th>
+      <th><a href="struts-core/apidocs/index.html">Struts Action Framework</a></th>
     </tr>
     <!-- 
     <tr>
@@ -42,10 +39,10 @@
       <th><a href="struts-bsf/apidocs/index.html">Struts BSF</a></th>
     </tr>
     <tr>
-      <th><a href="struts-tiles/apidocs/index.html">Struts Tiles</a></th>
+      <th><a href="struts-el/apidocs/index.html">Struts EL</a></th>
     </tr>
     <tr>
-      <th><a href="struts-el/apidocs/index.html">Struts EL</a></th>
+      <th><a href="struts-extras/apidocs/index.html">Struts Extras</a></th>
     </tr>
     <tr>
       <th><a href="struts-faces/apidocs/index.html">Struts JSF Integration Library</a></th>
@@ -53,14 +50,15 @@
     <tr>
       <th><a href="struts-flow/apidocs/index.html">Struts Flow</a></th>
     </tr>
-    <!--
     <tr>
-      <th><a href="struts-plugins/apidocs/index.html">Struts Plugins</a></th>
+      <th><a href="struts-sandbox/apidocs/index.html">Struts Sandbox</a></th>
     </tr>
     <tr>
-      <th><a href="struts-sandbox/apidocs/index.html">Struts Sandbox</a></th>
+      <th><a href="struts-taglib/apidocs/index.html">Struts Taglibs</a></th>
+    </tr>
+    <tr>
+      <th><a href="struts-tiles/apidocs/index.html">Struts Tiles</a></th>
     </tr>
-    -->
   </table>
   <br/>
   <table>

Modified: struts/site/trunk/xdocs/navigation.xml
URL: http://svn.apache.org/viewcvs/struts/site/trunk/xdocs/navigation.xml?rev=345227&r1=345226&r2=345227&view=diff
==============================================================================
--- struts/site/trunk/xdocs/navigation.xml (original)
+++ struts/site/trunk/xdocs/navigation.xml Thu Nov 17 03:37:57 2005
@@ -60,7 +60,7 @@
         <item name="Shale Framework" href="shale/index.html" />
     </menu>
  
-    <menu name="Core Extensions">
+    <menu name="Extensions">
         <item name="BSF Scripting" href="/struts-bsf/index.html"/>
         <item name="EL" href="/struts-el/index.html"/>
         <item name="Extras" href="/struts-extras/index.html"/>



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