Modified: struts/action/trunk/taglib/src/site/xdoc/indexedprops.xml
URL: 
http://svn.apache.org/viewvc/struts/action/trunk/taglib/src/site/xdoc/indexedprops.xml?rev=411140&r1=411139&r2=411140&view=diff
==============================================================================
--- struts/action/trunk/taglib/src/site/xdoc/indexedprops.xml (original)
+++ struts/action/trunk/taglib/src/site/xdoc/indexedprops.xml Fri Jun  2 
05:32:19 2006
@@ -39,13 +39,13 @@
                     except with explicit JSP expressions (<%= %>).
                 </p>
                 <p>
-                    The Struts framework provides much more powerful features
+                    The Struts Action Framework provides much more powerful 
features
                     related to
                     indexed properties, but in truth most of the heavy lifting
                     is not even in
-                    the Struts framework, but in the Jakarta Commons Beanutils
+                    the Struts Action Framework, but in the Jakarta Commons 
Beanutils
                     package. This
-                    package is used by Struts to provide this functionality.
+                    package is used by the framework to provide this 
functionality.
                     You can see the
                     javadoc documentation for the Beanutils package at
                     <a
@@ -65,7 +65,7 @@
                     properties",
                     "nested properties" and "indexed tags", which are all
                     related but slightly
-                    different. The latter is exclusive to Struts, but the
+                    different. The latter is exclusive to the framework, but 
the
                     first two are also
                     provided by the Beanutils package. This article will cover
                     all three of
@@ -74,8 +74,8 @@
             </subsection>
             <subsection name="Indexed Properties">
                 <p>
-                    The simplest demonstration of using indexed properties in
-                    Struts can be
+                    The simplest demonstration of using indexed properties 
+                    can be
                     shown with the following simple bean and JSP page:
                 </p>
                 <pre>
@@ -100,7 +100,7 @@
                     an "int" and
                     the "set" method takes an "int" and "String". The
                     Beanutils package and
-                    Struts recognizes this arrangement of signatures as an
+                    the framework recognizes this arrangement of signatures as 
an
                     "indexed property",
                     in this case with the property name "stringIndexed".
                 </p>
@@ -269,7 +269,7 @@
                 <p>
                     First note the use of the class "LabelValueBean". This is
                     a simple class
-                    provided in the Struts library which represents a pair of
+                    provided in the framework which represents a pair of
                     two Strings, a
                     "label" and a "value". It itself is a bean, providing
                     these two
@@ -305,12 +305,9 @@
             </subsection>
             <subsection name="Dynamic Indexes for Indexed Properties">
                 <p>
-                    When people started using indexed properties in Struts
-                    tags, I'm
-                    reasonably certain they started out with a high level of
-                    enthusiasm, but
-                    were somewhat frustrated when they discovered reality. The
-                    reality is
+                    People often start using indexed properties with 
+                    enthusiasm, but soon become frustrated by an inconvenient  
+                    reality. The reality is
                     that the "index" for indexed properties often needs to be
                     a dynamic value,
                     usually from the "indexId" counter in the 
"&lt;logic:iterate&gt;"
@@ -561,13 +558,6 @@
                     &lt;/html-el:form&gt;
                     &lt;/body&gt;
                     &lt;/html&gt;</pre>
-                <p>
-                    The Struts-EL library is part of the Struts distribution,
-                    in the "contrib"
-                    directory. The one drawback to using Struts-EL is that it
-                    requires a web
-                    container supporting the Servlet 2.3 specification.
-                </p>
             </subsection>
         </section>
     </body>
Modified: struts/action/trunk/taglib/src/site/xdoc/ssl.xml
URL: 
http://svn.apache.org/viewvc/struts/action/trunk/taglib/src/site/xdoc/ssl.xml?rev=411140&r1=411139&r2=411140&view=diff
==============================================================================
--- struts/action/trunk/taglib/src/site/xdoc/ssl.xml (original)
+++ struts/action/trunk/taglib/src/site/xdoc/ssl.xml Fri Jun  2 05:32:19 2006
@@ -136,11 +136,11 @@
             </subsection>
 
             <a name="sslext"/>
-            <subsection name="The sslext Struts Extension">
+            <subsection name="The sslext Extension">
 
                 <p>
-                    An extension to Struts 1.1, named sslext, helps solve many
-                    of these issues for Struts
+                    An extension to version 1.1, named sslext, helps solve many
+                    of these issues for Struts Action 
                     developers. It extends the ActionConfig class,
                     RequestProcessor, and Plugin classes to
                     define a framework where developers may specify the

Modified: struts/action/trunk/tiles/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/struts/action/trunk/tiles/src/site/site.xml?rev=411140&r1=411139&r2=411140&view=diff
==============================================================================
--- struts/action/trunk/tiles/src/site/site.xml (original)
+++ struts/action/trunk/tiles/src/site/site.xml Fri Jun  2 05:32:19 2006
@@ -57,9 +57,6 @@
             <item
                     name="Apache Struts Home"
                     href="http://struts.apache.org/"/>
-            <item
-                    name="Struts Action 1"
-                    href="../index.html"/>
         </menu>
         ${reports}
     </body>

Modified: struts/action/trunk/tiles/src/site/xdoc/dev_tiles.xml
URL: 
http://svn.apache.org/viewvc/struts/action/trunk/tiles/src/site/xdoc/dev_tiles.xml?rev=411140&r1=411139&r2=411140&view=diff
==============================================================================
--- struts/action/trunk/tiles/src/site/xdoc/dev_tiles.xml (original)
+++ struts/action/trunk/tiles/src/site/xdoc/dev_tiles.xml Fri Jun  2 05:32:19 
2006
@@ -166,7 +166,7 @@
 <subsection href="setup" name="Enabling your application for Tiles">
 
 <p>
-The Tiles framework is bundled with Struts but not enabled by default. To 
enable Tiles you need to:
+The Tiles framework is bundled with Struts Action but not enabled by default. 
To enable Tiles you need to:
 </p>
 
 <ul>
@@ -191,7 +191,7 @@
 <pre>&lt;%@ taglib uri="http://struts.apache.org/tags-tiles"; prefix="tiles" 
%&gt;</pre>
 <ul>
 <li>
-  If you plan to use Tiles definitions defined in a centralized file, you need 
to create this file and instruct Struts to load the Tiles plugin which will 
create the factory corresponding to the file. You can have more than one 
definitions file.
+  If you plan to use Tiles definitions defined in a centralized file, you need 
to create this file and instruct Struts Action to load the Tiles plugin which 
will create the factory corresponding to the file. You can have more than one 
definitions file.
 
 <ul>
 <li>
@@ -212,7 +212,7 @@
 
 <ul>
 <li>
-  <strong>Note:</strong> This plugin creates one factory for each Struts 
modules. The plugin first reads the factory parameters from 
<code>web.xml</code> and then overloads them with the ones defined in the first 
<code>struts-config.xml</code> file.
+  <strong>Note:</strong> This plugin creates one factory for each Struts 
Action modules. The plugin first reads the factory parameters from 
<code>web.xml</code> and then overloads them with the ones defined in the first 
<code>struts-config.xml</code> file.
 </li>
 </ul>
 </li>
@@ -255,13 +255,13 @@
 <a 
href="http://www.manning.com/getpage.html?project=husted&amp;filename=chapters.html";>
 <strong>Developing applications with Tiles</strong></a> by Cedric Dumoulin and 
Ted Husted.
 Sample chapter from
-<a 
href="http://www.amazon.com/exec/obidos/ISBN=1930110502/hitchhikeguidetoA/";>Struts
 in Action</a>; available as a free download (PDF).
+<a 
href="http://www.amazon.com/exec/obidos/ISBN=1930110502/apachesoftwar-20/";>Struts
 in Action</a>; available as a free download (PDF).
 </p>
 
 <p>
 <a href="http://www.oreilly.com/catalog/jakarta/chapter/";>
 <strong>Using Tiles</strong></a> Sample beta chapter from
-<a 
href="http://www.amazon.com/exec/obidos/ISBN=0596003285/hitchhikeguidetoA/";>Programming
 Jakarta Struts</a>; available as a free download (PDF).
+<a 
href="http://www.amazon.com/exec/obidos/ISBN=0596003285/apachesoftwar-20/";>Programming
 Jakarta Struts</a>; available as a free download (PDF).
 </p>
 
 <p>

Modified: struts/action/trunk/tiles/src/site/xdoc/examples.xml
URL: 
http://svn.apache.org/viewvc/struts/action/trunk/tiles/src/site/xdoc/examples.xml?rev=411140&r1=411139&r2=411140&view=diff
==============================================================================
--- struts/action/trunk/tiles/src/site/xdoc/examples.xml (original)
+++ struts/action/trunk/tiles/src/site/xdoc/examples.xml Fri Jun  2 05:32:19 
2006
@@ -140,7 +140,7 @@
 
     <p>The scenario above can be avoided by defining Tiles in an XML 
configuration
        file.  The file is loaded at servlet startup using the Tiles Servlet or
-       a Struts plugin.  The example below defines the Tile in an XML file and
+       a Struts Action plugin.  The example below defines the Tile in an XML 
file and
        uses the Tiles insert tag in a JSP to invoke it.</p>
 
     <strong>file: WEB-INF/tiles-defs.xml</strong>
@@ -271,7 +271,7 @@
 <section name="Tiles Controllers">
 </section>
 
-<section name="Using Tiles With Struts">
+<section name="Using Tiles With Struts Action">
 
     <subsection name="Tiles Controller Invoking a Struts Action">
     </subsection>

Modified: struts/action/trunk/tiles/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/struts/action/trunk/tiles/src/site/xdoc/index.xml?rev=411140&r1=411139&r2=411140&view=diff
==============================================================================
--- struts/action/trunk/tiles/src/site/xdoc/index.xml (original)
+++ struts/action/trunk/tiles/src/site/xdoc/index.xml Fri Jun  2 05:32:19 2006
@@ -18,13 +18,13 @@
 -->
 <document>
 <properties>
-  <title>Struts Action 1 - Tiles</title>
+  <title>Struts Action Framework - Tiles</title>
 </properties>
 
 <body>
 
 <section name="Welcome To Tiles">
-    <p>Welcome to the Struts Tiles subproject.  Tiles is a templating 
+    <p>Welcome to the Struts Tiles component.  Tiles is a templating 
     framework.  It can be used to create a common look &amp; feel for a web 
site or
     application and to create reusable view components.  This site will give 
you
     all the information you need to get started.</p>
@@ -42,8 +42,8 @@
                    Definitions can take place : 
                    <ul>
                       <li>in a centralized xml file</li>
-                      <li>directly in jsp pages</li>
-                      <li>programatically in struts actions</li>
+                      <li>directly in JSP pages</li>
+                      <li>programatically in Actions</li>
                    </ul>
                 </li>
                 <li>

Modified: struts/action/trunk/tiles/src/site/xdoc/installation.xml
URL: 
http://svn.apache.org/viewvc/struts/action/trunk/tiles/src/site/xdoc/installation.xml?rev=411140&r1=411139&r2=411140&view=diff
==============================================================================
--- struts/action/trunk/tiles/src/site/xdoc/installation.xml (original)
+++ struts/action/trunk/tiles/src/site/xdoc/installation.xml Fri Jun  2 
05:32:19 2006
@@ -63,19 +63,19 @@
             Project</a>.  See the <a href="dependencies.html">Dependencies 
List</a>
             for specific versions.  These dependencies can be downloaded using
             the Maven build process.</li>
-        <li><strong>Struts Framework</strong> - If you are planning to use
-            Tiles with Struts, you should download and install Struts from
+        <li><strong>Struts Action Framework</strong> - If you are planning to 
use
+            Tiles with Struts Action, you should download and install the 
framework from
             <a href="http://struts.apache.org/";>
             Apache Struts Project</a>.
-            If you have acquired Tiles with the Struts distribution, you
-            don't need to install it again. Tiles can run without Struts.
+            If you have acquired Tiles with the framework distribution, you
+            don't need to install it again. Tiles can run without the 
framework.
             In this case you lose some features.</li>
     </ul>
 </section>
 
 <section name="Install A Tiles Binary Distribution" href="Installing">
     <p>First, download a binary distribution of Tiles, currently distributed
-       with the Struts Framework.</p>
+       with the Struts Action Framework.</p>
     <p>Unpack the Tiles binary distribution into a convenient directory.
        (If you build Tiles from the source distribution,
        the result of the build will already be an unpacked binary distribution
@@ -102,7 +102,7 @@
         <li>If you want to use the <em>definitions configuration file</em>, you
             need to initialize the definitions factory. This can be done as 
follows:
         <ul>
-            <li><strong>Using Tiles With Struts</strong> -
+            <li><strong>Using Tiles With Struts Action</strong> -
                 Modify the <code>WEB-INF/web.xml</code> file
                 for your web application to use a <code>&lt;servlet&gt;
                 </code> that responds to Struts actions.  Usually, this
@@ -122,10 +122,10 @@
     <load-on-startup>2</load-on-startup>
  </servlet>
     ]]></source>
-            <li><strong>Using Tiles With Struts</strong> -
+            <li><strong>Using Tiles With Struts Action</strong> -
                 You will also need to 
                 configure the Tiles Plugin and the Tiles Request Processor to
-                allow Struts to respond to Tiles-based Action Forwards.  Below
+                allow the framework to respond to Tiles-based Action Forwards. 
 Below
                 is a sample Tiles Plugin configuration.
     <source><![CDATA[
     <plug-in className="org.apache.struts.tiles.TilesPlugin">
@@ -135,8 +135,8 @@
     </plug-in>
     ]]></source>
             </li>
-            <li><strong>Using Tiles Without Struts</strong> -
-                If you don't want to use Struts, use the
+            <li><strong>Using Tiles Without Struts Action</strong> -
+                If you don't want to use the framework, use the
                 <code>org.apache.struts.tiles.TilesServlet</code> as the 
servlet.
             </li>
             <li>Create a configuration file for definitions. Its name must
@@ -181,10 +181,10 @@
             <code>commons-*.jar</code> files (copied earlier) on the
             CLASSPATH that is submitted to the compiler.</li>
     </ul>
-    <p>Note to Struts 1.0 users :</p>
+    <p>Note to version 1.0 users :</p>
     <ul>
-        <li>You should use a <code>tiles.jar</code> built with Struts 
1.0.x.</li>
-        <li>If you have downloaded a Tiles version build with Struts 1.0.x, you
+        <li>You should use a <code>tiles.jar</code> built with version 
1.0.x.</li>
+        <li>If you have downloaded a Tiles version build with version 1.0.x, 
you
             already have it. </li>
     </ul>
 


Reply via email to