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/18 12:21:47 UTC

svn commit: r345480 - in /struts/core/trunk: ./ xdocs/userGuide/

Author: husted
Date: Fri Nov 18 03:21:35 2005
New Revision: 345480

URL: http://svn.apache.org/viewcvs?rev=345480&view=rev
Log:
Continue final pass. 

Modified:
    struts/core/trunk/project.xml
    struts/core/trunk/xdocs/userGuide/building_controller.xml
    struts/core/trunk/xdocs/userGuide/building_model.xml
    struts/core/trunk/xdocs/userGuide/building_view.xml
    struts/core/trunk/xdocs/userGuide/configuration.xml
    struts/core/trunk/xdocs/userGuide/index.xml
    struts/core/trunk/xdocs/userGuide/installation-1.0.xml
    struts/core/trunk/xdocs/userGuide/installation.xml
    struts/core/trunk/xdocs/userGuide/introduction.xml
    struts/core/trunk/xdocs/userGuide/navigation.xml
    struts/core/trunk/xdocs/userGuide/preface.xml
    struts/core/trunk/xdocs/userGuide/release-notes.xml

Modified: struts/core/trunk/project.xml
URL: http://svn.apache.org/viewcvs/struts/core/trunk/project.xml?rev=345480&r1=345479&r2=345480&view=diff
==============================================================================
--- struts/core/trunk/project.xml (original)
+++ struts/core/trunk/project.xml Fri Nov 18 03:21:35 2005
@@ -21,7 +21,7 @@
 
   <extend>build/project.xml</extend>
   <id>struts-core</id>
-  <name>Struts Core</name>
+  <name>Struts Action Framework</name>
 
 
 

Modified: struts/core/trunk/xdocs/userGuide/building_controller.xml
URL: http://svn.apache.org/viewcvs/struts/core/trunk/xdocs/userGuide/building_controller.xml?rev=345480&r1=345479&r2=345480&view=diff
==============================================================================
--- struts/core/trunk/xdocs/userGuide/building_controller.xml (original)
+++ struts/core/trunk/xdocs/userGuide/building_controller.xml Fri Nov 18 03:21:35 2005
@@ -32,8 +32,8 @@
     Now that we understand how to construct the Model and View components
     of your application, it is time to focus on the Controller
     components.
-    Struts Core includes a servlet that implements the primary function of
-     mapping a request URI to an Action class.
+    The framework includes a servlet that implements the primary function of
+    mapping a request URI to an Action class.
     Therefore, your primary responsibilities related to the Controller are:
     </p>
 
@@ -127,7 +127,7 @@
     It then goes through an enumeration of all init-param
     elements, looking for those elements who's name starts with
     config/.
-    For each of these elements, Core loads the configuration file specified
+    For each of these elements, the framework loads the configuration file specified
     by the value of that init-param, and assigns a "prefix"
     value to that module's ModuleConfig instance consisting of the piece
     of the init-param name following "config/".
@@ -156,7 +156,7 @@
 
     <p>
     The RequestProcessor is where the majority of the core processing
-    occurs for each request. Since Struts 1.3, the default Request Processor
+    occurs for each request. Since version 1.3, the default Request Processor
     (<code>ComposableRequestProcessor</code>) is composed using
     <a href="http://jakarta.apache.org/commons/chain/">Jakarta Commons Chain</a>,
     which is an implementation of the <i>Chain of Responsibility</i> pattern (CoR).
@@ -462,7 +462,7 @@
     scope.
     If they're in the session it's important to implement the form's
     reset method to initialize the form before each use.
-    Core sets the ActionForm's properties from the request parameters and
+    The framework sets the ActionForm's properties from the request parameters and
     sends the validated form to the appropriate Action's execute
     method.
     </p>
@@ -486,7 +486,7 @@
     <li>
     The ActionForm object also offers a standard validation mechanism.
     If you override a "stub" method, and provide error messages in the
-    standard application resource, Core will automatically validate the
+    standard application resource, The framework will automatically validate the
     input from the form (using your method).
     See "<a href="building_view.html#3_3_4_Automatic_Form_Validation">Automatic Form
     Validation</a>" for details. Of course, you can also ignore the
@@ -552,7 +552,7 @@
 
     <p>
     Maintaining a separate concrete ActionForm class for each form in your
-    Struts Core application is time-consuming.
+    application is time-consuming.
     It is particularly frustrating when all the ActionForm does is gather
     and validate simple properties that are passed along to a business
     JavaBean.
@@ -561,7 +561,7 @@
     This bottleneck can be alleviated through the use of DynaActionForm classes.
     Instead of creating a new ActionForm subclass and new get/set methods for
     each of your bean's properties, you can list its properties, type, and
-    defaults in the Struts Core configuration file.
+    defaults in the framework's configuration file.
     </p>
 
     <p>
@@ -722,7 +722,7 @@
     DynaActionForms cannot be instantiated using a no-argument constructor.
     In order to simulate the extra properties,
     there is a lot of machinery involved in their construction.
-    You must rely on Struts Core to instantiate a DynaActionForm for you,
+    You must rely on the framework to instantiate a DynaActionForm for you,
     via the ActionMapping.
     </p>
 
@@ -860,14 +860,14 @@
     <p>
     The DynaActionForm classes offer the ability to create ActionForm beans
     at initialization time, based on a list of properties enumerated in the
-    Struts Core configuration file.
+    the framework's configuration file.
     However, many HTML forms are generated dynamically at request time.
     Since the properties of these forms' ActionForm beans are not all known
     ahead of time, we need a new approach.
     </p>
 
     <p>
-    Struts Core allows you to make one or more of your ActionForm's
+    The framework allows you to make one or more of your ActionForm's
     properties' values a Map instead of a traditional atomic object.
     You can then store the data from your form's dynamic fields in that Map.
     Here is an example of a map-backed ActionForm class:
@@ -902,9 +902,9 @@
         </li>
 
         <li>
-        Struts Core should look for get/set methods that take a String key
+        The framework should look for get/set methods that take a String key
         parameter to find the correct sub-property value.
-        Core will, of course, use the keyname value from the
+        The framework will, of course, use the keyname value from the
         parentheses when it calls the get/set methods.
         </li>
 
@@ -967,7 +967,7 @@
     listname[index].
     The braces in the bean property name indicate that the bean property named
     listname is indexed (probably backed by a List), and that
-    Core should look for get/set methods that take an index parameter
+    the framework should look for get/set methods that take an index parameter
     in order to find the correct sub-property value.
     </p>
 
@@ -1177,9 +1177,9 @@
     to another conceptual layer;
     otherwise, you may be left with an inflexible application which can only
     be accessed in a web-application environment.
-    Struts Core should be viewed as simply the <strong>foundation</strong>
+    The framework should be viewed as simply the <strong>foundation</strong>
     for implementing MVC in your applications.
-    Core provides a useful control layer, but it is not a fully
+    Struts Action Framework provides a useful control layer, but it is not a fully
     featured platform for building MVC applications, soup to nuts.
     </p>
 
@@ -1195,7 +1195,7 @@
     org.apache.struts.action.ExceptionHandler and override the
     execute method.
     Your execute method should process the Exception and return
-    an ActionForward object to tell Core where to forward to next.
+    an ActionForward object to tell the framework where to forward to next.
     Then you configure your handler in struts-config.xml like this:
     </p>
 
@@ -1368,7 +1368,7 @@
 
     <p>
     PlugIns are configured using &lt;plug-in&gt; elements within the
-    Struts Core configuration file.
+    framework's configuration file.
     See <a href="configuration.html#5_2_3_PlugIn_Configuration">PlugIn Configuration</a>
     for details.
     </p>
@@ -1437,7 +1437,7 @@
     instantiated new ActionMapping instances, and called all of
     the appropriate setter methods.
     To make this process easier,
-    Struts Core uses the Jakarta Commons Digester component
+    the framework uses the Jakarta Commons Digester component
     to parse an XML-based description of the desired mappings
     and create the appropriate objects initialized
     to the appropriate default values.
@@ -1458,7 +1458,7 @@
     There are several other elements that can be placed in the
     struts-config file to customize your application.
     See "<a href="configuration.html">Configuring Applications</a>" for more
-    about the other elements in the Struts Core configuration file.
+    about the other elements in the framework's configuration file.
     </p>
 
     <p>
@@ -1594,7 +1594,7 @@
     For a complete description of the elements that can be used with the
     action element, see the
     <a href="http://struts.apache.org/dtds/struts-config_1_3.dtd">
-    Apache Struts Core Configuration DTD</a> and the
+    configuration DTD</a> and the
     <a href="../struts-core/apidocs/org/apache/struts/action/ActionMapping.html">
     ActionMapping documentation</a>.
     </p>
@@ -1699,7 +1699,7 @@
     </p>
 
     <p>
-    The Struts Core configuration file includes several other elements that you
+    The configuration file includes several other elements that you
     can use to customize your application.
     See "<a href="configuration.html">Configuring Applications</a>" for details.
     </p>
@@ -1769,13 +1769,13 @@
     the URI matched by the wildcard will then be substituted into various
     attributes of the action mapping and its action forwards replacing
     {1}.
-    For the rest of the request, Core will see the action mapping and its
+    For the rest of the request, the framework will see the action mapping and its
     action forwards containing the new values.
     </p>
 
     <p>
     Mappings are matched against the request in the order they appear in
-    the Struts Core configuration file. If more than one pattern matches the
+    the framework's configuration file. If more than one pattern matches the
     last one wins, so less specific patterns must appear before more
     specific ones. However, if the request URL can be matched against
     a path without any wildcards in it, no wildcard matching is performed
@@ -1872,7 +1872,7 @@
 <a name="logging"/>
 <subsection name="4.11 Commons Logging Interface">
     <p>
-    Struts Core doesn't configure logging itself -- it's all done by
+    The framework doesn't configure logging itself -- it's all done by
     <a href="http://jakarta.apache.org/commons/">commons-logging</a>
     under the covers.
     The default algorithm is a search:
@@ -1907,7 +1907,7 @@
     </p>
 
     <p>
-    Because Struts Core uses commons-logging and, therefore,
+    Because the framework uses commons-logging and, therefore,
     includes the necessary JAR files,
     you've probably had the occasional fleeting thought,
     <em>"Should I use commons-logging?"</em>
@@ -1959,8 +1959,8 @@
     </p>
 
     <p>
-    For examples of using logging in Struts Core classes, see the
-    Action classes in the Struts MailReader example application.
+    For examples of using logging in the framework classes, see the
+    Action classes in our MailReader example application.
     </p>
 
 </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=345480&r1=345479&r2=345480&view=diff
==============================================================================
--- struts/core/trunk/xdocs/userGuide/building_model.xml (original)
+++ struts/core/trunk/xdocs/userGuide/building_model.xml Fri Nov 18 03:21:35 2005
@@ -305,7 +305,7 @@
 
     <p>
         As of Struts 1.3, Commons Chain is used to construct the default
-        Request Processor for Struts Core.
+        Request Processor for the framework.
         See the "<a href="preface.html#chain">Preface</a>" section for more.
     </p>
 </subsection>

Modified: struts/core/trunk/xdocs/userGuide/building_view.xml
URL: http://svn.apache.org/viewcvs/struts/core/trunk/xdocs/userGuide/building_view.xml?rev=345480&r1=345479&r2=345480&view=diff
==============================================================================
--- struts/core/trunk/xdocs/userGuide/building_view.xml (original)
+++ struts/core/trunk/xdocs/userGuide/building_view.xml Fri Nov 18 03:21:35 2005
@@ -29,7 +29,7 @@
 <subsection name="3.1 Overview">
 
     <p>
-        Struts Core provides infrastructural support for view components,
+        The framework provides infrastructural support for view components,
         but does not provide any actual view components of its own.
         Several options are available, such as
         <a href="http://struts.apache.org/struts-taglib/">Struts Taglib</a>,
@@ -40,7 +40,7 @@
     </p>
 
     <p>
-        Features provided by Struts Core for direct use by view components
+        Features provided by the framework for direct use by view components
         include <a href="#resources">Message Resources</a>
         for localizing text and images,
         and <a href="#formbeans">FormBeans</a> to provide for automatic
@@ -120,7 +120,7 @@
         
         <li>
         <a href="../struts-core/apidocs/org/apache/struts/util/MessageResources.html">
-        <strong>MessageResources</strong></a> - The Struts Core class 
+        <strong>MessageResources</strong></a> - The framework class 
         <code>org.apache.struts.util.MessageResources</code> lets you treat
         a set of resource bundles like a database, and allows you to request
         a particular message string for a particular Locale (normally one
@@ -131,7 +131,7 @@
     </ul>
 
     <p>
-    Please note that the i18n support in a framework like Core is limited to 
+    Please note that the i18n support in a server-side framework is limited to 
     the <strong>presentation</strong> of internationalized text and images to the user.
     Support for Locale specific <strong>input methods</strong> (used with languages
     such as Japanese, Chinese, and Korean) is left up to the client device, 
@@ -219,9 +219,9 @@
 
 <p>
     <strong>Note:</strong> While the examples given here use JSP and custom tags,
-    the ActionForm beans and the other Core controller components are
+    the ActionForm beans and the other controller components are
     View neutral. 
-    Struts Core can be used with Cocoon, Velocity Templates, XSLT, and
+    The framework be used with Cocoon, Velocity Templates, XSLT, and
     any other presentation technology that can be rendered via a Java servlet. 
 </p>
 
@@ -278,12 +278,12 @@
     Most browsers support this through a &lt;input type="file"&gt; element, 
     that generates a file browse button, but it's up to the developer to 
     handle the incoming files. 
-    Struts Core handles these "multipart" forms in a way identical to building 
+    The framework handles these "multipart" forms in a way identical to building 
     normal forms. 
     </p>
     
     <p>
-    For an example of using Struts Core to create a simple login form, 
+    For an example of using the framework to create a simple login form, 
     see the "<a href="../faqs/actionForm.html">
     Buiding an ActionForm Howto</a>".
     </p>
@@ -294,7 +294,7 @@
 
     <p>
     In addition to the form and bean interactions described above,
-    Struts Core offers an additional facility to validate the input
+    The framework offers an additional facility to validate the input
     fields it has received.
     To utilize this feature, override the following method in your ActionForm
     class:
@@ -350,15 +350,14 @@
     </p>
 
     <p>
-    The Struts Core Validator, covered in the next section, may be
-    used to easily 
+    The Struts Validator, covered in the next section, may be used to easily 
     validate ActionForms.
     </p>
     
 </subsection>
 
 <a name="validator"/>
-<subsection name="3.3.3 The Struts Core Validator">
+<subsection name="3.3.3 The Struts Validator">
 
 
     <p>
@@ -411,7 +410,7 @@
     </p>
     
     <p>
-    For more about the Struts Core Validator, see the 
+    For more about the Struts Validator, see the 
     <a href="./dev_validator.html">Developers Guide</a>.
     </p>
     
@@ -513,12 +512,12 @@
 <a name="presentation_frameworks"/>
 <subsection name="3.4 Presentation Frameworks">
     <p>
-        Struts Core is supported by many presentation frameworks,
-        and there are a great number of extensions to Struts Core
-        to help make creating view components even easier.
+        The framework is supported by many presentation technologies,
+        and there are a great number of extensions that 
+        make creating view components even easier.
     </p>
 
-    Some popular presentation layer frameworks include:
+    Some popular presentation layer technologies include:
     <ul>
         <li>
             <a href="http://struts.apache.org/struts-taglib/">

Modified: struts/core/trunk/xdocs/userGuide/configuration.xml
URL: http://svn.apache.org/viewcvs/struts/core/trunk/xdocs/userGuide/configuration.xml?rev=345480&r1=345479&r2=345480&view=diff
==============================================================================
--- struts/core/trunk/xdocs/userGuide/configuration.xml (original)
+++ struts/core/trunk/xdocs/userGuide/configuration.xml Fri Nov 18 03:21:35 2005
@@ -31,23 +31,23 @@
     <p>
     Before you can build an application, you need to lay a solid foundation.
     There are several setup tasks you need to perform before deploying
-    your Struts Core application.
-    These include components in the Struts Core configuration file
+    your application.
+    These include components in the configuration file
     and in the Web Application Deployment Descriptor.
     </p>
 
  </subsection>
     
  <a name="struts-config"/>
- <subsection name="5.2 The Struts Core configuration file">
+ <subsection name="5.2 The configuration file">
 
     <p>
     The <a href="building_controller.html#4_8_Writing_Action_Mappings">Writing Action
     Mappings</a> section covered writing the <code>&lt;form-bean&gt;</code> and
-    <code>&lt;action-mapping&gt;</code> portions of the Struts Core configuration file.
-    These elements usually play an important role in the development of a
-    Struts Core application.
-    The other elements in Struts Core configuration file tend to be static:
+    <code>&lt;action-mapping&gt;</code> portions of the configuration file.
+    These elements usually play an important role in the development of an 
+    application.
+    The other elements in a configuration file tend to be static:
     you set them once and leave them alone.
     </p>
 
@@ -270,7 +270,7 @@
 <subsection name="5.2.2 Message Resources Configuration">
 
     <p>
-    Struts Core has built in support for internationalization (I18N).
+    The framework has built in support for internationalization (I18N).
     You can define one or more <code>&lt;message-resources&gt;</code> elements
     for your webapp; modules can define their own resource bundles.
     Different bundles can be used simultaneously in your application, the 'key'
@@ -329,8 +329,8 @@
 <subsection name="5.2.3 PlugIn Configuration">
 
     <p>
-    Struts Core PlugIns are configured using the <code>&lt;plug-in&gt;</code>
-    element within the Struts Core configuration file.
+    Struts PlugIns are configured using the <code>&lt;plug-in&gt;</code>
+    element within the configuration file.
     This element has only one valid attribute, 'className', which is the fully
     qualified name of the Java class which implements the
     <code>org.apache.struts.action.PlugIn</code> interface.
@@ -359,8 +359,8 @@
 <subsection name="5.3 Configuring Your Application for Modules">
 
     <p>
-    Very little is required in order to start taking advantage of the Struts
-    Core module feature.
+    Very little is required in order to start taking advantage of the 
+    module feature.
     Just go through the following steps:
     </p>
 
@@ -416,7 +416,7 @@
     Since Struts 1.0, you listed your configuration file as an initialization
     parameter to the action servlet in <code>web.xml</code>.
     This is still done since Struts 1.1, but the parameter can be extended.
-    In order to tell the Struts Core machinery about your different modules, you
+    In order to tell the framework machinery about your different modules, you
     specify multiple 'config' initialization parameters, with a slight twist.
     You'll still use 'config' to tell the ActionServlet about your "default"
     module, however, for each additional module, you will
@@ -452,7 +452,7 @@
     <p>
     (The <code>struts-default.xml</code> would be equivalent to what most folks call
     <code>struts-config.xml</code>.
-    I just like the symmetry of having all my Struts Core module configuration files being
+    I just like the symmetry of having all my module configuration files being
     named <code>struts-<em>module</em>.xml</code>)
     </p>
 
@@ -578,7 +578,7 @@
     <p>
     The final step in setting up the application is to configure the
     application deployment descriptor (stored in file
-    <code>WEB-INF/web.xml</code>) to  include all the Struts Core or Taglib components that
+    <code>WEB-INF/web.xml</code>) to  include all the framework or Taglib components that
     are required.
     Using the deployment descriptor for the example application as a guide,
     we see that the following entries need to be created or modified.
@@ -627,7 +627,7 @@
         <strong>chainConfig</strong> - Comma-separated list of either 
         context-relative or classloader path(s) to load commons-chain catalog
         definitions from.  If none specified, the default catalog that is
-        provided with Struts Core will be used. (Since Struts Core 1.3)
+        provided with the framework will be used. (Since version 1.3)
         </li>
         
         <li>
@@ -652,7 +652,7 @@
 	<li>
 	<strong>configFactory</strong> - The Java class name of the 
 	ModuleConfigFactory used to create the implementation of the 
-	ModuleConfig interface. (Since Struts Core 1.3)
+	ModuleConfig interface. (Since version 1.3)
 	[org.apache.struts.config.impl.DefaultModuleConfigFactory]
         </li>
 
@@ -683,7 +683,7 @@
     </ul>
 
      <p>
-       <strong>WARNING</strong> - Struts Core will not
+       <strong>WARNING</strong> - The framework will not
        operate correctly if you define more than one
        <code>&lt;servlet&gt;</code> element for a controller
        servlet, or a subclass of the standard controller servlet class.
@@ -698,11 +698,11 @@
 
     <p>
     <strong>Note:</strong> The material in this section is not specific to
-    Struts Core.
+    Struts Action Framework.
     The configuration of servlet mappings is defined in the Java Servlet
     Specification.
-    This section describes the most common means of configuring a Struts
-    Core application.
+    This section describes the most common means of configuring a 
+    application.
     </p>
 
     <p>
@@ -763,7 +763,7 @@
 <source>http://www.mycompany.com/myapplication/logon.do</source>
 
         <p>
-        <strong>WARNING</strong> - Struts Core will not
+        <strong>WARNING</strong> - The framework will not
         operate correctly if you define more than one
         <code>&lt;servlet-mapping&gt;</code> element for the controller
         servlet.
@@ -812,7 +812,7 @@
 <subsection name="5.5 Add Struts Components To Your Application">
 
     <p>
-    To use Struts Core, you must copy <code>struts.jar</code>
+    To use the framework, you must copy <code>struts.jar</code>
     (and all of the <code>commons-*.jar</code> files) into your
     <code>WEB-INF/lib</code> directory. To use Struts Taglib, 
     you must also copy the .tld files that you require into
@@ -859,12 +859,12 @@
           in the web application's class loader, unless they are specifically
           programmed to use the Thread context class loader.
 
-            For example, Struts Core dynamically loads your action and form bean
+            For example, the framework dynamically loads your action and form bean
             classes, and normally would not be able to find those classes.
-            Struts Core has been programmed to deal with this in <em>most</em>
+            The framework has been programmed to deal with this in <em>most</em>
             scenarios, but it has not been thoroughly audited to ensure that
             it works in <em>all</em> scenarios.  The Commons libraries that
-            Struts Core uses have <strong>NOT</strong> been audited to catch all
+            the framework uses have <strong>NOT</strong> been audited to catch all
             possible scenarios where this might become a problem.
 
         </li>
@@ -875,7 +875,7 @@
           statics are global only within a particular web applicaiton (which
           would be true if the class was loaded from the webapp class loader).
 
-            There are many cases where Struts Core, and the Commons libraries it
+            There are many cases where the framework, and the Commons libraries it
             relies on, use static variables to maintain information that is
             presumed to be visible only within a single web application.
             Sharing these JAR files can cause unwanted interactions, and
@@ -894,7 +894,7 @@
 
       <p>
         In spite of these difficulties, it is possible that sharing the
-        Struts Core and Commons JAR files <em>might</em> appear to work for you.
+        Struts and Commons JAR files <em>might</em> appear to work for you.
         However, this is <strong>NOT</strong> a supported configuration.
       </p>
 
@@ -910,14 +910,14 @@
 
 </subsection>
 <a name="config_logging"/>
-<subsection name="5.6 Logging in Struts Core BAsed Applications">
+<subsection name="5.6 Logging">
 
   <p>
   Since Struts 1.0, the logging functionality was fairly limited.  You could
   set a debugging detail level with a servlet initialization parameter, and
   all log messages were written to wherever <code>ServletContext.log()</code>
   output is sent by your servlet container.  With Struts 1.1, however, all
-  logging messages written by Struts Core itself, as well as the commons libraries
+  logging messages written by the framework, as well as the commons libraries
   that it utilizes, flow through an abstract wrapper called
   <a href="http://jakarta.apache.org/commons/logging">Commons Logging</a>,
   which can be used as a wrapper around any logging implementation.  The most
@@ -931,7 +931,7 @@
   <p>
   This section does not attempt to fully explain how Commons Logging is
   configured and used.  Instead, it focuses on pertinent details of using
-  Commons Logging in a Struts Core based environment. For complete documentation
+  Commons Logging in connection with the Struts Action Framework. For complete documentation
   on using Commons Logging, consult the documentation for the logging system
   you are using, plus the Commons Logging
   <a href="http://jakarta.apache.org/commons/logging/commons-logging-1.0.3/docs/api/">

Modified: struts/core/trunk/xdocs/userGuide/index.xml
URL: http://svn.apache.org/viewcvs/struts/core/trunk/xdocs/userGuide/index.xml?rev=345480&r1=345479&r2=345480&view=diff
==============================================================================
--- struts/core/trunk/xdocs/userGuide/index.xml (original)
+++ struts/core/trunk/xdocs/userGuide/index.xml Fri Nov 18 03:21:35 2005
@@ -78,7 +78,7 @@
                     <li><a href="introduction.html#controllerConcepts">1.2.3 The Controller: ActionServlet and ActionMapping</a></li>
                     </ul>
                     </li>
-                <li><a href="introduction.html#flow">1.3 Struts Control Flow</a></li>
+                <li><a href="introduction.html#flow">1.3 Control Flow</a></li>
                 </ul></li>
             <li><a href="building_model.html">2. Building Model Components</a>
                 <ul>
@@ -147,7 +147,7 @@
              <li><a href="configuration.html">5. Configuring Applications</a>
                 <ul>
                 <li><a href="configuration.html#config-overview">5.1 Overview</a></li>
-                <li><a href="configuration.html#struts-config">5.2 The Struts Configuration File</a>
+                <li><a href="configuration.html#struts-config">5.2 The Configuration File</a>
                     <ul>
                     <li><a href="configuration.html#controller_config">5.2.1 Controller Configuration</a></li>
                     <li><a href="configuration.html#resources_config">5.2.2 Message Resources Configuration</a></li>
@@ -165,15 +165,11 @@
                     <ul>
                     <li><a href="configuration.html#dd_config_servlet">5.4.1 Configure the Action Servlet Instance</a></li>
                     <li><a href="configuration.html#dd_config_mapping">5.4.2 Configure the Action Servlet Mapping</a></li>
-                    <li><a href="configuration.html#dd_config_taglib">5.4.3 Configure the Struts Tag Libraries"</a>
-                        <ul>
-                            <li><a href="configuration.html#dd_config_taglib_uri">5.4.3.1 Configure the Struts Tag Libraries (Servlet 2.3/2.4)</a></li>
-                        </ul>
-                    </li>
+                    <li><a href="configuration.html#dd_config_taglib">5.4.3 Configure Struts Taglib"</a></li>
                     </ul>
                  </li>
                 <li><a href="configuration.html#config_add">5.5 Add Struts Components To Your Application</a></li>
-                <li><a href="configuration.html#config_logging">5.6 Logging in Struts Applications</a></li>
+                <li><a href="configuration.html#config_logging">5.6 Logging</a></li>
                </ul>             
              </li>
 

Modified: struts/core/trunk/xdocs/userGuide/installation-1.0.xml
URL: http://svn.apache.org/viewcvs/struts/core/trunk/xdocs/userGuide/installation-1.0.xml?rev=345480&r1=345479&r2=345480&view=diff
==============================================================================
--- struts/core/trunk/xdocs/userGuide/installation-1.0.xml (original)
+++ struts/core/trunk/xdocs/userGuide/installation-1.0.xml Fri Nov 18 03:21:35 2005
@@ -2,7 +2,7 @@
 <document url="installation-1.0.html">
 
   <properties>
-    <title>The Struts Framework Project - Installation (1.0)</title>
+    <title>Installation (1.0)</title>
   </properties>
 
   <body>

Modified: struts/core/trunk/xdocs/userGuide/installation.xml
URL: http://svn.apache.org/viewcvs/struts/core/trunk/xdocs/userGuide/installation.xml?rev=345480&r1=345479&r2=345480&view=diff
==============================================================================
--- struts/core/trunk/xdocs/userGuide/installation.xml (original)
+++ struts/core/trunk/xdocs/userGuide/installation.xml Fri Nov 18 03:21:35 2005
@@ -26,8 +26,8 @@
   <section name="6.2 Installation" href="installation">
   <subsection name="Prerequisite Software" href="Prerequisites">
 
-  <p>The Struts Core binary distribution needs three other software packages installed to
-  operate. You may already have these installed on your system. To build Struts from
+  <p>The framework's binary distribution needs three other software packages installed to
+  operate. You may already have these installed on your system. To build the framework from
   source you may need to acquire and install several others. The complete list is as
   follows:</p>
 
@@ -37,7 +37,7 @@
       your operating system platform.
       A good starting point for locating Java Development Kit distributions is
       <a href="http://java.sun.com/j2se">http://java.sun.com/j2se</a>.
-      To build Struts, Java 1.4.2 (the latest production JDK) is suggested and 
+      To build the framework, Java 1.4.2 (the latest production JDK) is suggested and 
       required if you use our Maven build system. </li>
 
   <li><strong>Servlet Container</strong> - You <strong>must</strong> download and install a
@@ -45,23 +45,23 @@
       version 2.3 or later, and the JavaServer Pages (JSP) Specification,
       version 1.2 or later.  One popular choice is to download Apache's
       <a href="http://jakarta.apache.org/tomcat/">Tomcat</a>, but any compliant
-      container should work well with Struts.</li>
+      container should work well with the framework.</li>
 
-  <li><strong>XML Parser</strong> - Struts <strong>requires</strong> the presence of an XML
+  <li><strong>XML Parser</strong> - The framework <strong>requires</strong> the presence of an XML
       parser that is compatible with the Java API for XML Parsing (JAXP)
       specification, 1.1 or later. This is bundled with J2SE 1.4 and later.
       For earlier versions of Java, the easiest way to obtain JAXP is
       probably by downloading the Web Services Developers Kit
       (1.1 or later!). See the <a href="http://java.sun.com/xml/jaxp/faq.html#jaxp-ri-latest">
       Sun JAXP FAQ</a> for more information.)
-      In Struts-based web applications, you may replace the reference
+      In your applications, you may replace the reference
       implementation classes with any other JAXP compliant parser, such as
       <a href="http://xml.apache.org/xerces-j">Xerces</a>.  See detailed
       instructions related to the parser in the instructions for
       <a href="#Building">building</a> and <a href="#Installing">installing</a>
-      Struts, below.</li>
+      the framework, below.</li>
 
-  <li><strong>Maven Build System</strong> - If you are building Struts Core from the
+  <li><strong>Maven Build System</strong> - If you are building the framework from the
       source distribution, you must download and install the 
       <a href="http://maven.apache.org/maven-1.x/">Apache Maven 1.0.2</a> build system.
       </li>
@@ -70,16 +70,16 @@
 
   </subsection>
 
-  <subsection name="Install A Struts Core Library Distribution" href="Installing">
+  <subsection name="Install a Library Distribution" href="Installing">
 
-    <p>First, download a binary distribution of Struts Core Library by following the
+    <p>First, download a binary distribution of Struts Action Library by following the
     instructions <a href=".http://struts.apache.org/acquiring.html">here</a>. Then, make sure
     you have downloaded and installed the
     <a href="#Prerequisites">prerequisite</a> software packages described
     above.</p>
 
-    <p>Unpack the Struts Core Library distribution into a convenient directory.
-    (If you <a href="#Building">build Struts from the source distribution</a>,
+    <p>Unpack the Library distribution into a convenient directory.
+    (If you <a href="#Building">building from the source distribution</a>,
     the result of the build will already be an unpacked binary distribution
     for you). The distribution consists of the following contents:</p>
 
@@ -87,55 +87,35 @@
     <li><strong>lib/*.jar</strong> - The struts-*.jars contains Java classes
         distributed by Apache Struts. The other JAR files contain packages
         from other projects that are imported by Struts subprojects. When you launch
-        a Struts-based application, these JARs need to be available to your
+        a your application, these JARs need to be available to your
         application, usually by copying them to the application's
         <code>WEB-INF/lib</code> directory. <br />
-        <em>WARNING</em> - If you are going to be hosting multiple Struts
-        based applications on the same servlet container, you will be tempted
-        to place the <code>struts.jar</code> file into the shared repository
+        <em>WARNING</em> - If you are going to be hosting multiple 
+        applications on the same servlet container, you will be tempted
+        to place the <code>struts-action.jar</code> file into the shared repository
         supported by your container.  Be advised that this may cause
         ClassNotFoundException problems unless <em>all</em> of
         your application classes are stored in the shared repository.</li>
-    <li><strong>lib/*.tld</strong> - These are the "tag library
-        descriptor" files that describe the custom tags in the various Struts
-        JSP tag libraries. The tld file for any Struts taglibs that you use should
-        be copied into the <code>WEB-INF</code> directory of your web
-        application. (You can omit this
-        step if the <a href="configuration.html#dd_config_taglib_23">standard uri</a>
-        is referenced.)</li>
-    <li><strong>webapps/struts-blank.war</strong> - This is a simple "web
-        application archive" file containing a basic starting point for
-        building your own Struts-based applications.</li>
-    <li><strong>webapps/struts-mailreader.war</strong> - This is an example
-        web application that uses a large percentage of Struts features.
-        You can install this web application on any servlet container
-        compatible with the Servlet 2.2 (or later) and JSP 1.2 (or later)
-        specifications. If an XML parser is not made available to web
-        applications by your container, you will need to add one to the
-        WEB-INF/lib directory of this web application.</li>
     </ul>
 
-    <p>To use Struts Core Library in your own application, you will need to follow
+    <p>To use Struts Action Library in your own application, you will need to follow
     these steps:</p>
     <ul>
-    <li>Copy the <code>lib/*.jar</code> files from the Struts
-        Core Library distribution into the <code>WEB-INF/lib</code> directory of your
+    <li>Copy the <code>lib/*.jar</code> files from the 
+        Library distribution into the <code>WEB-INF/lib</code> directory of your
         web application.</li>
-    <li>Copy the <code>lib/*.tld</code> files for any Struts taglibs you use
-        from the Library distribution into the <code>WEB-INF</code> directory
-        of your web application.</li>
     <li>Modify the <code>WEB-INF/web.xml</code> file for your web application
         to include a <code>&lt;servlet&gt;</code> element to define the
         controller servlet, and a <code>&lt;servlet-mapping&gt;</code> element
         to establish which request URIs are mapped to this servlet. Use the
-        <code>WEB-INF/web.xml</code> file from the Struts example application
+        <code>WEB-INF/web.xml</code> file from the Struts Mailreader application
         for a detailed example of the required syntax.</li>
     <li>Create a file <code>WEB-INF/struts-config.xml</code> that defines the
         action mappings and other characteristics of your specific application.
         You can use the <code>struts-config.xml</code> file from the Struts
         Blank application for examples of the required syntax.</li>
-    <li>At the top of each JSP page that will use the Struts JST tags,
-        add line(s) declaring the Struts JSP tag libraries used on
+    <li>At the top of each JSP page that will use JSP tags,
+        add line(s) declaring the JSP tag libraries used on
         this particular page, like this:</li>
     </ul>
 
@@ -149,7 +129,7 @@
         to include the JAR files (copied earlier) on the
         CLASSPATH that is submitted to the compiler.</li>
     </ul>
-</subsection> <subsection name="Installing Struts Core With Your Servlet Container" href="Containers">
+</subsection> <subsection name="Installing The Framework With Your Servlet Container" href="Containers">
 
 <p>For most containers, you need only to: </p>
 <ul>
@@ -158,13 +138,13 @@
   <li>In some cases, you may need to restart your container if it is running.</li>
 </ul>
 
-<h4>Running Struts Core Applications Under A Security Manager</h4>
+<h4>Running Applications Under A Security Manager</h4>
 
 <p>Many application servers execute web applications under the control of a
 Java security manager, with restricted permissions on what classes in the web
 application can do.  If you utilize form beans with mapped properties, you may
 encounter security exceptions unless you add the following permission to the
-set of permissions granted to your Struts Core application's codebase:</p>
+set of permissions granted to your application's codebase:</p>
 <pre>
   permission java.lang.RuntimePermission "accessDeclaredMembers";
 </pre>
@@ -172,7 +152,7 @@
 <p>Consult the documentation on your application server for more information
 about how to configure additional security manager permissions.</p>
 
-<h4>Installing Struts Core on Various Containers</h4>
+<h4>Installing on Various Containers</h4>
 <ul>
   <li>Bluestone Universal Business Server 7.2 - <a href="installation-ubs72.html">Additional
     steps required.</a></li>
@@ -203,7 +183,7 @@
   <li>WebSphere - <a href="installation-was352-x.html">Steps for the Example Application.</a></li></ul>
 </subsection>
 
-<subsection name="Building Struts Core From Source" href="Building">
+<subsection name="Building From Source" href="Building">
 
     <p>
     First, download a source distribution of a Struts subproject by following the

Modified: struts/core/trunk/xdocs/userGuide/introduction.xml
URL: http://svn.apache.org/viewcvs/struts/core/trunk/xdocs/userGuide/introduction.xml?rev=345480&r1=345479&r2=345480&view=diff
==============================================================================
--- struts/core/trunk/xdocs/userGuide/introduction.xml (original)
+++ struts/core/trunk/xdocs/userGuide/introduction.xml Fri Nov 18 03:21:35 2005
@@ -219,13 +219,13 @@
     <subsection name="1.2.3 The Controller: ActionServlet and ActionMapping" href="controllerConcepts">
       
       <p>
-        Struts Core is the <em>Controller</em> portion of the application.
+        Struts Action Framework provides the <em>Controller</em> portion of the application.
         The Controller is focused on receiving
         requests from the client (typically a user running a web browser), deciding
         what business logic function is to be performed, and then delegating
         responsibility for producing the next phase of the user interface to
         an appropriate View component.  The primary component of the
-        Controller in Struts Core is a servlet of class <code>ActionServlet</code>. This servlet
+        Controller in the framework is a servlet of class <code>ActionServlet</code>. This servlet
         is configured by defining a set of <code>ActionMappings</code>. 
         An ActionMapping defines a <code>path</code> that is matched against the 
         request URI of the incoming request and usually specifies the
@@ -234,12 +234,12 @@
         encapsulate calls to business logic classes, interpret the outcome, and
         ultimately dispatch control to the appropriate View component to create the
         response.
-        While Struts Core dispatches to a View, actually rendering the
+        While the framework dispatches to a View, actually rendering the
         View is outside its scope.
       </p>
         
       <p>
-        Struts Core also supports the ability to use <code>ActionMapping</code>
+        The framework also supports the ability to use <code>ActionMapping</code>
         classes that have additional properties beyond the standard ones required
         to operate the controller. This allows you to store additional information
         specific to your application and still utilize the remaining features of
@@ -261,7 +261,7 @@
       <subsection name="1.3 Struts Control Flow" href="flow">
       
         <p>
-          Struts Core provides several components that make up the <strong>Control</strong>
+          The framework provides several components that make up the <strong>Control</strong>
           layer of a MVC-style application. These include a controller component (servlet),
           developer-defined request handlers, and several supporting objects.
         </p>
@@ -272,10 +272,10 @@
           Others are generic tags found convenient when writing applications. Other 
           taglibs, including 
           <a href="http://java.sun.com/products/jsp/jstl/index.html">JSTL</a>, 
-          can also be used with Struts Core. Other presentation technologies, like
+          can also be used with the framework. Other presentation technologies, like
           <a href="http://jakarta.apache.org/velocity/index.html">Velocity Templates</a> and 
           <a href="http://www.w3.org/TR/xslt">XSLT</a>
-          can also be used with Struts Core.
+          can also be used with the framework.
         </p>
 
         <p>
@@ -304,7 +304,7 @@
 
         <p>
           The controller component consults the ActionMappings as it routes HTTP
-          requests to other components in Struts Core. Requests may be forwarded to JavaServer Pages or
+          requests to other components in the framework. Requests may be forwarded to JavaServer Pages or
           <a href="../struts-core/apidocs/org/apache/struts/action/Action.html">Action</a> 
           [<code>org.apache.struts.action.Action</code>] subclasses provided by the
           Struts developer. Often, a request is first forwarded to an Action and then to a JSP 
@@ -344,7 +344,7 @@
           Since each client has their own session, they will each also have their own
           shopping cart. </p>
         <p>
-          In a Struts Core application, most of the business logic can be
+          Most of the business logic in an application can be
           represented using JavaBeans. An Action can call the properties of a JavaBean 
           without knowing how it actually works. This encapsulates the business logic, 
           so that the Action can focus on error handling and where to forward control.
@@ -353,7 +353,7 @@
         <p>
           JavaBeans can also be used to manage input forms. A key problem in designing
           Web applications is retaining and validating what a user has entered between
-          requests. With Struts Core, you can define your own set of input bean classes, by
+          requests. You can define your own set of input bean classes, by
           subclassing 
           <a href="../struts-core/apidocs/org/apache/struts/action/ActionForm.html">ActionForm</a>
           [<code>org.apache.struts.action.ActionForm</code>]. The ActionForm class makes it
@@ -366,7 +366,7 @@
         <p>
           The form bean can be used by a JSP to collect data from the user ... by an
           Action object to validate the user-entered data ... and then by the JSP again to
-          re-populate the form fields. In the case of validation errors, Struts Core has a
+          re-populate the form fields. In the case of validation errors, the framework has a
           shared mechanism for raising and displaying error messages.
         </p>
         
@@ -409,7 +409,7 @@
         </p>
         
         <p>
-          Struts Core and Struts Taglibs were designed from the ground-up
+          The framework and Struts Taglib were designed from the ground-up
           to support the internationalization features built into the Java platform. All the field labels
           and messages can be retrieved from a 
           <a href="../struts-core/apidocs/org/apache/struts/util/MessageResources.html">message resource</a>.
@@ -450,7 +450,7 @@
         
         <p>
           <a href="index.html">Other sections</a> in this document cover the
-          various Struts Core components in greater detail.
+          various framework components in greater detail.
           The Struts Taglib distribution includes several Developer Guides
           covering various aspects of the tag components.
           The Struts Applications subproject provides sample applications

Modified: struts/core/trunk/xdocs/userGuide/navigation.xml
URL: http://svn.apache.org/viewcvs/struts/core/trunk/xdocs/userGuide/navigation.xml?rev=345480&r1=345479&r2=345480&view=diff
==============================================================================
--- struts/core/trunk/xdocs/userGuide/navigation.xml (original)
+++ struts/core/trunk/xdocs/userGuide/navigation.xml Fri Nov 18 03:21:35 2005
@@ -3,9 +3,9 @@
          href="http://struts.apache.org/userGuide"
         image="../images/struts.gif"
       authors="false">
-<title>Apache Struts - Struts Core - User Guide</title>
+<title>Apache Struts - Struts Action Framework - User Guide</title>
   <body>
-    <menu name="Struts Core User Guide">
+    <menu name="Action Framework User Guide">
       <item 
         name="Table of Contents"     
         href="userGuide/index.html"/>
@@ -35,7 +35,7 @@
         href="userGuide/installation.html"/>
     </menu>
 
-    <menu name="Struts Core Developer Guides">
+    <menu name="Action Framework Developer Guides">
         <item 
             name="Utilities"
             href="userGuide/dev_util.html"/>
@@ -55,7 +55,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 Framework Home"                 
             href="index.html"/>
     </menu>
   </body>

Modified: struts/core/trunk/xdocs/userGuide/preface.xml
URL: http://svn.apache.org/viewcvs/struts/core/trunk/xdocs/userGuide/preface.xml?rev=345480&r1=345479&r2=345480&view=diff
==============================================================================
--- struts/core/trunk/xdocs/userGuide/preface.xml (original)
+++ struts/core/trunk/xdocs/userGuide/preface.xml Fri Nov 18 03:21:35 2005
@@ -61,7 +61,7 @@
     </p>
 
     <p>If you've created web applications for other platforms, you may be able to follow along
-    and visit the other references as needed. The core technologies used by Core are
+    and visit the other references as needed. The core technologies used by the framework are
     also used by most other Java web development products, so the background information will be
     useful in any Java project.
     </p>
@@ -113,7 +113,7 @@
     <p>A very important part of HTTP for the web developer is the request/response cycle. To use HTTP
     you have to make a request. A HTTP server, like a web server, is then obliged to respond. When you
     build your web application, you design it to react to a HTTP request by returning a HTTP response.
-    Frameworks like Core abstract much of these nuts and bolts, but it is important to understand
+    Frameworks abstract much of these nuts and bolts, but it is important to understand
     what is happening behind the scenes. </p>
 
     <p>If you are not familiar with the HTTP request/response cycle, we <strong>strongly</strong> recommend the
@@ -126,14 +126,14 @@
     <a name="java"/>
     <subsection name="0.4 The Java Language and Application Frameworks">
 
-    <p>Struts Core is written in the popular and versatile
+    <p>The framework is written in the popular and versatile
     <a href="http://java.sun.com/docs/books/jls/first_edition/html/index.html">Java programming language</a>.
-    Java is an object-orientated language, and Core makes good use of many
+    Java is an object-orientated language, and the framework makes good use of many
     object-orientated techniques.  In addition, Java natively supports the
     concept of <em>threads</em>, which allows more than one task to be
     performed at the same time.  A good understanding of Java, and especially
     object-orientated programming (OOP) and threading, will help
-    you get the most out of Struts Core and this User Guide. </p>
+    you get the most out of the framework and this User Guide. </p>
 
     <p>For more about Java and threads, see </p>
 
@@ -183,7 +183,7 @@
               implemented.
               Most importantly, we can adjust the Chain without changing
               how callers invoke the Chain.
-              As of Struts Core 1.3,
+              As of version 1.3,
               the default Request Processor,
               which acts as the framework's "kernal",
               is a Chain of Responsiblity.
@@ -223,12 +223,12 @@
     <a name="javabeans"/>
     <subsection name="0.5 JavaBeans">
 
-    <p>Like many Java applications, most of the Struts Core objects are designed as
+    <p>Like many Java applications, most of the framework objects are designed as
     <a href="http://java.sun.com/products/javabeans/">JavaBeans</a>. Following the JavaBean design patterns makes
-    the Struts Core classes easier to use -- both by Java developers and by Java development tools. </p>
+    the framework's classes easier to use -- both by Java developers and by Java development tools. </p>
 
     <p>Although JavaBeans were first created for visual elements, these object design patterns have been found to
-    be useful as the basis for any reusable component, like those used by the Struts Core framework.</p>
+    be useful as the basis for any reusable component, like those used by the framework.</p>
 
     <p>For more about JavaBeans, see:</p>
 
@@ -258,7 +258,7 @@
     </p>
 
     <p>
-    The Struts Core framework uses Introspection to convert HTTP parameters into JavaBean properties and to populate HTML fields from JavaBean properties.
+    The framework uses Introspection to convert HTTP parameters into JavaBean properties and to populate HTML fields from JavaBean properties.
     This technique makes it easy to "roundtrip" properties between HTML forms and JavaBeans.
     </p>
 
@@ -302,7 +302,7 @@
     </p>
 
     <p>
-    In a Struts Core application, you can use DynaBeans to describe your HTML forms.
+    In your application, you can use DynaBeans to describe your HTML forms.
     This strategy can avoid creating a formal JavaBean subclass to store a few simple properties.
     </p>
 
@@ -329,7 +329,7 @@
     <p>Java applications, including web applications, are often configured using
     <a href="http://java.sun.com/j2se/1.4.1/docs/api/java/util/Properties.html">Properties</a>
     files. Properties files are the basis for the
-    <a href="http://java.sun.com/j2se/1.4.1/docs/api/java/util/ResourceBundle.html">ResourceBundles</a> that Core uses to provide message resources
+    <a href="http://java.sun.com/j2se/1.4.1/docs/api/java/util/ResourceBundle.html">ResourceBundles</a> that the framework uses to provide message resources
     to an application. </p>
 
     <p>For more about Properties files, see: </p>
@@ -342,7 +342,7 @@
     <p>Java ResourceBundles use one or more Properties files to provide internationalized messages
     to users based their
     <a href="http://java.sun.com/j2se/1.4.1/docs/api/java/util/Locale.html">Locale</a>.
-    Support for localizing an application was built into Struts Core from the ground-up.</p>
+    Support for localizing an application was built into the framework from the ground-up.</p>
 
     <p>For more about localization and ResourceBundles, see </p>
 
@@ -408,7 +408,7 @@
       </ul>
 
     <p>
-    Struts Core provides a ready-to-use servlet for your application [<code>org.apache.struts.action.ActionServlet</code>].
+    The framework provides a ready-to-use servlet for your application [<code>org.apache.struts.action.ActionServlet</code>].
     As a Struts developer, you can then just write objects that the Struts ActionServlet calls when needed.
     But it is still helpful to understand the basics of what servlets are,
     and the role they play in a Java web application.
@@ -628,9 +628,9 @@
 
       <p>The Struts 1.0, 1.1, and 1.2 versions require only version 2.2 or later
       of the Servlet Specification to be implemented by your servlet container,
-      so those versions of Struts Core do not use Filters. Beginning with the Struts
-      Core 1.3 version, a container that supports version 2.3 or later of the Servlet
-      Specification is required, and it is possible that Struts itself might use
+      so those versions do not use Filters. Beginning with the 
+      1.3 version, a container that supports version 2.3 or later of the Servlet
+      Specification is required, and it is possible that the framework might use
       Filters in the future.</p>
       
       <p>
@@ -708,7 +708,7 @@
       <p>
       The Java Servlet specification extends the HTTP request/response cycle by allowing the request to be dispatched,
       or forwarded, between resources.
-      Struts Core uses this feature to pass a request through specialized components,
+      The framework uses this feature to pass a request through specialized components,
       each handling one aspect of the response.
       In the normal course, a request may pass through a controller object, a model object,
       and finally to a view object as part of a single request/response cycle.
@@ -810,7 +810,7 @@
     <a href="http://java.sun.com/webservices/docs/1.0/tutorial/doc/JSPBeans.html">JavaBeans Components in JSP Pages</a>
     in the Java Web Services Tutorial.</p>
 
-    <p>Struts Core also works well with the
+    <p>The framework also works well with the
     <a href="http://java.sun.com/products/jsp/jstl"><strong>JavaServer Pages Standard Tag Library</strong></a>
     (JSTL) and taglibs from other sources, like
     <a href="http://jsptags.com/">JSP Tags</a>,
@@ -827,7 +827,7 @@
         expressions) for dynamic attribute values.
     </p>
 
-    <p>There are also toolkits available that make Struts Core easy to use with
+    <p>There are also toolkits available that make the framework easy to use with
     <a href="http://stxx.sourceforge.net/">XSLT</a> and
     <a href="http://jakarta.apache.org/velocity/tools/index.html">Velocity Templates</a>.
     </p>
@@ -869,7 +869,7 @@
     <a name="xml"/>
     <subsection name="0.9 Extensible Markup Language (XML)" href="">
 
-    <p>The features provided by the Struts Core framework rely on a number of objects that are
+    <p>The features provided by the framework rely on a number of objects that are
     usually deployed using a configuration file written in
     <a href="http://www.w3.org/XML/">Extensible Markup Language</a>. XML is also used to
     configure Java web applications; so, this is yet another familiar approach.
@@ -904,7 +904,7 @@
 
         <p>
         The Java Servlet platform uses an XML configuration file to deploy servlets (among other things).
-        Likewise, Struts Core uses an XML configuration file to deploy objects used by the framework.
+        Likewise, The framework uses an XML configuration file to deploy objects.
         </p>
 
     </subsection>
@@ -913,7 +913,7 @@
       <subsection name="0.10 JAAS" href="">
 
       <p>
-          While Core can work with any approach to user authentication and authorization, Struts 1.1 and later offers
+          While the framework can work with any approach to user authentication and authorization, Struts 1.1 and later offers
           direct support for the standard Java Authentication and Authorization Service (JAAS).
           You can now specify security roles on an action-by-action basis.
       </p>
@@ -925,7 +925,7 @@
       <a href="http://java.sun.com/webservices/docs/1.0/tutorial/index.html">Java Web Services Tutorial</a>.</p>
 
       <p>
-          A popular extension for handling security in a Java web application, including a Struts Core application,
+          A popular extension for handling security in a Java web application, including a framework application,
           is <a href="http://securityfilter.sourceforge.net/">SecurityFilter</a>.
       </p>
     </subsection>
@@ -934,7 +934,7 @@
     <subsection name="0.11 Other layers">
 
     <p>
-       Struts Core provides the control layer for a web application.
+       The framework provides the control layer for a web application.
        Developers can use this layer with other standard technologies
        to provide the business, data access, and presentation layers.
     </p>

Modified: struts/core/trunk/xdocs/userGuide/release-notes.xml
URL: http://svn.apache.org/viewcvs/struts/core/trunk/xdocs/userGuide/release-notes.xml?rev=345480&r1=345479&r2=345480&view=diff
==============================================================================
--- struts/core/trunk/xdocs/userGuide/release-notes.xml (original)
+++ struts/core/trunk/xdocs/userGuide/release-notes.xml Fri Nov 18 03:21:35 2005
@@ -69,21 +69,21 @@
               to join us.
           </p>
 
-          <h3>Struts Core Library</h3>
+          <h3>Struts Action Library</h3>
 
           <p>
               Since Struts 1.2.7, we have subdivided Struts into several subprojects,
               each with its own release cycle.
               The set of seven subprojects derived from Struts 1.2 is sometimes referred to as "Struts Classic".
-              The Struts Classic subprojects are Applications, Core, EL, Extras, Site, Taglibs, and Tiles.
+              The Struts Classic subprojects are Action, Applications, EL, Extras, Site, Taglibs, and Tiles.
               These subprojects will all inherit version 1.3.0, but, thereafter, 
               subproject revisions will increment independently of each other.
           </p>
 
           <p>
-              Since many teams will use Struts Core with one or more Struts subprojects,
-              we are bundling the jars for subprojects that utilize Struts Core into a single distribution
-              called "Struts Core Library".
+              Since many teams will use Struts Action Framework with one or more extensions,
+              we are bundling the jars for extensions that utilize the framework into a single distribution
+              called "Struts Action Library".
           </p>
 
           <p>
@@ -105,10 +105,10 @@
               </li>
           </ul>
 
-          <h3>Struts Core</h3>
+          <h3>Struts Action Framework</h3>
 
           <p>
-              Major changes to Struts Core include
+              Major changes to the framework include
           </p>
 
           <ul>
@@ -249,10 +249,10 @@
               </li>
           </ul>
 
-          <h3>Struts Plugins</h3>
+          <h3>Struts Extras</h3>
 
           <p>
-              This subproject was extracted from the Plugins package within Struts Core.
+              This subproject was extracted from the Actions and Plugins packages of Struts 1.2.
               The code itself is unchanged.
           </p>
 



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