You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mr...@apache.org on 2006/07/02 04:48:17 UTC

svn commit: r418542 - in /struts/struts1/trunk: ./ apps/ apps/src/site/ core/ el/ el/src/site/ extras/ extras/src/site/ faces/ faces/src/site/ scripting/ scripting/src/site/ src/site/ src/site/fml/faqs/ src/site/xdoc/ src/site/xdoc/apidocs/ src/site/xd...

Author: mrdon
Date: Sat Jul  1 19:48:15 2006
New Revision: 418542

URL: http://svn.apache.org/viewvc?rev=418542&view=rev
Log:
Renaming Struts Action in the documentation
STR-2898

Modified:
    struts/struts1/trunk/apps/pom.xml
    struts/struts1/trunk/apps/src/site/site.xml
    struts/struts1/trunk/core/pom.xml
    struts/struts1/trunk/el/pom.xml
    struts/struts1/trunk/el/src/site/site.xml
    struts/struts1/trunk/extras/pom.xml
    struts/struts1/trunk/extras/src/site/site.xml
    struts/struts1/trunk/faces/pom.xml
    struts/struts1/trunk/faces/src/site/site.xml
    struts/struts1/trunk/pom.xml
    struts/struts1/trunk/scripting/pom.xml
    struts/struts1/trunk/scripting/src/site/site.xml
    struts/struts1/trunk/src/site/fml/faqs/kickstart.fml
    struts/struts1/trunk/src/site/site.xml
    struts/struts1/trunk/src/site/xdoc/apidocs/index.xml
    struts/struts1/trunk/src/site/xdoc/checkstyle.xml
    struts/struts1/trunk/src/site/xdoc/dependencies.xml
    struts/struts1/trunk/src/site/xdoc/faqs/apps.xml
    struts/struts1/trunk/src/site/xdoc/faqs/db-howto.xml
    struts/struts1/trunk/src/site/xdoc/faqs/eclipse.xml
    struts/struts1/trunk/src/site/xdoc/faqs/navigation.xml
    struts/struts1/trunk/src/site/xdoc/faqs/netbeans40.xml
    struts/struts1/trunk/src/site/xdoc/faqs/works.xml
    struts/struts1/trunk/src/site/xdoc/index.xml
    struts/struts1/trunk/src/site/xdoc/jxr.xml
    struts/struts1/trunk/src/site/xdoc/learning.xml
    struts/struts1/trunk/src/site/xdoc/roadmap.xml
    struts/struts1/trunk/src/site/xdoc/userGuide/building_controller.xml
    struts/struts1/trunk/src/site/xdoc/userGuide/configuration.xml
    struts/struts1/trunk/src/site/xdoc/userGuide/installation.xml
    struts/struts1/trunk/src/site/xdoc/userGuide/introduction.xml
    struts/struts1/trunk/src/site/xdoc/userGuide/navigation.xml
    struts/struts1/trunk/src/site/xdoc/userGuide/release-notes-1_3_1.xml
    struts/struts1/trunk/src/site/xdoc/userGuide/release-notes-1_3_2.xml
    struts/struts1/trunk/src/site/xdoc/userGuide/release-notes-1_3_3.xml
    struts/struts1/trunk/src/site/xdoc/userGuide/release-notes.xml
    struts/struts1/trunk/taglib/pom.xml
    struts/struts1/trunk/taglib/src/site/site.xml
    struts/struts1/trunk/tiles/pom.xml
    struts/struts1/trunk/tiles/src/site/site.xml

Modified: struts/struts1/trunk/apps/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/pom.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/apps/pom.xml (original)
+++ struts/struts1/trunk/apps/pom.xml Sat Jul  1 19:48:15 2006
@@ -37,7 +37,7 @@
    <distributionManagement>
        <site>
            <id>apache-site</id>
-           <url>scp://people.apache.org/www/struts.apache.org/struts/struts-apps</url>
+           <url>scp://people.apache.org/www/struts.apache.org/1.x/struts-apps</url>
        </site>
    </distributionManagement>
 

Modified: struts/struts1/trunk/apps/src/site/site.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/src/site/site.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/apps/src/site/site.xml (original)
+++ struts/struts1/trunk/apps/src/site/site.xml Sat Jul  1 19:48:15 2006
@@ -13,9 +13,8 @@
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org" /> 
-            <item name="Action 1" href="http://struts.apache.org/struts-action" />
-            <item name="Action 2" href="http://struts.apache.org/struts-action2" />
-            <item name="Shale" href="http://struts.apache.org/struts-shale" /> 
+            <item name="Struts 1" href="http://struts.apache.org/1.x" />
+            <item name="Struts 2" href="http://struts.apache.org/2.0" />
         </links>
 
         <menu name="Apps">

Modified: struts/struts1/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/pom.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/core/pom.xml (original)
+++ struts/struts1/trunk/core/pom.xml Sat Jul  1 19:48:15 2006
@@ -45,7 +45,7 @@
     <distributionManagement>
         <site>
             <id>apache-site</id>
-            <url>scp://people.apache.org/www/struts.apache.org/struts/struts-core</url>
+            <url>scp://people.apache.org/www/struts.apache.org/1.x/struts-core</url>
         </site>
     </distributionManagement>
 

Modified: struts/struts1/trunk/el/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/el/pom.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/el/pom.xml (original)
+++ struts/struts1/trunk/el/pom.xml Sat Jul  1 19:48:15 2006
@@ -39,7 +39,7 @@
    <distributionManagement>
       <site>
          <id>apache-site</id>
-         <url>scp://people.apache.org/www/struts.apache.org/struts/struts-el</url>
+         <url>scp://people.apache.org/www/struts.apache.org/1.x/struts-el</url>
       </site>
    </distributionManagement>
    

Modified: struts/struts1/trunk/el/src/site/site.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/el/src/site/site.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/el/src/site/site.xml (original)
+++ struts/struts1/trunk/el/src/site/site.xml Sat Jul  1 19:48:15 2006
@@ -13,11 +13,10 @@
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org" /> 
-            <item name="Action 1" href="http://struts.apache.org/struts-action" />
-            <item name="Action 2" href="http://struts.apache.org/struts-action2" />
-            <item name="Shale" href="http://struts.apache.org/struts-shale" /> 
+            <item name="Struts 1" href="http://struts.apache.org/1.x" />
+            <item name="Struts 2" href="http://struts.apache.org/2.0" />
         </links>
-        <menu name="Struts Action - El Taglibs">
+        <menu name="Struts 1 - El Taglibs">
             <item name="Welcome" href="index.html"/>
             <item name="FAQ" href="struts-el.html"/>
         </menu>

Modified: struts/struts1/trunk/extras/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/extras/pom.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/extras/pom.xml (original)
+++ struts/struts1/trunk/extras/pom.xml Sat Jul  1 19:48:15 2006
@@ -39,7 +39,7 @@
    <distributionManagement>
       <site>
          <id>apache-site</id>
-         <url>scp://people.apache.org/www/struts.apache.org/struts/struts-extras</url>
+         <url>scp://people.apache.org/www/struts.apache.org/1.x/struts-extras</url>
       </site>
    </distributionManagement>
 

Modified: struts/struts1/trunk/extras/src/site/site.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/extras/src/site/site.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/extras/src/site/site.xml (original)
+++ struts/struts1/trunk/extras/src/site/site.xml Sat Jul  1 19:48:15 2006
@@ -13,9 +13,8 @@
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org" /> 
-            <item name="Action 1" href="http://struts.apache.org/struts-action" />
-            <item name="Action 2" href="http://struts.apache.org/struts-action2" />
-            <item name="Shale" href="http://struts.apache.org/struts-shale" /> 
+            <item name="Struts 1" href="http://struts.apache.org/1.x" />
+            <item name="Struts 2" href="http://struts.apache.org/2.0" />
         </links>
         <menu name="FAQs and HOWTOs">
             <item name="Dispatching And Validating"

Modified: struts/struts1/trunk/faces/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/faces/pom.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/faces/pom.xml (original)
+++ struts/struts1/trunk/faces/pom.xml Sat Jul  1 19:48:15 2006
@@ -39,7 +39,7 @@
    <distributionManagement>
       <site>
          <id>apache-site</id>
-         <url>scp://people.apache.org/www/struts.apache.org/struts/struts-faces</url>
+         <url>scp://people.apache.org/www/struts.apache.org/1.x/struts-faces</url>
       </site>
    </distributionManagement>
 

Modified: struts/struts1/trunk/faces/src/site/site.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/faces/src/site/site.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/faces/src/site/site.xml (original)
+++ struts/struts1/trunk/faces/src/site/site.xml Sat Jul  1 19:48:15 2006
@@ -33,9 +33,8 @@
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org" /> 
-            <item name="Action 1" href="http://struts.apache.org/struts-action" />
-            <item name="Action 2" href="http://struts.apache.org/struts-action2" />
-            <item name="Shale" href="http://struts.apache.org/struts-shale" /> 
+            <item name="Struts 1" href="http://struts.apache.org/1.x" />
+            <item name="Struts 2" href="http://struts.apache.org/2.0" />
         </links>
         
         <menu name="Components">

Modified: struts/struts1/trunk/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/pom.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/pom.xml (original)
+++ struts/struts1/trunk/pom.xml Sat Jul  1 19:48:15 2006
@@ -60,7 +60,7 @@
         </repository>
         <site>
             <id>apache-site</id>
-            <url>scp://people.apache.org/www/struts.apache.org/struts/</url>
+            <url>scp://people.apache.org/www/struts.apache.org/1.x/</url>
         </site>
     </distributionManagement>
 

Modified: struts/struts1/trunk/scripting/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/scripting/pom.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/scripting/pom.xml (original)
+++ struts/struts1/trunk/scripting/pom.xml Sat Jul  1 19:48:15 2006
@@ -39,7 +39,7 @@
    <distributionManagement>
       <site>
          <id>apache-site</id>
-         <url>scp://people.apache.org/www/struts.apache.org/struts/struts-scripting</url>
+         <url>scp://people.apache.org/www/struts.apache.org/1.x/struts-scripting</url>
       </site>
    </distributionManagement>
    

Modified: struts/struts1/trunk/scripting/src/site/site.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/scripting/src/site/site.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/scripting/src/site/site.xml (original)
+++ struts/struts1/trunk/scripting/src/site/site.xml Sat Jul  1 19:48:15 2006
@@ -13,11 +13,10 @@
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org" /> 
-            <item name="Action 1" href="http://struts.apache.org/struts-action" />
-            <item name="Action 2" href="http://struts.apache.org/struts-action2" />
-            <item name="Shale" href="http://struts.apache.org/struts-shale" /> 
+            <item name="Struts 1" href="http://struts.apache.org/1.x" />
+            <item name="Struts 2" href="http://struts.apache.org/2.0" />
         </links>
-        <menu name="Struts Action - Scripting">
+        <menu name="Struts 1 - Scripting">
             <item name="Welcome" href="index.html"/>
             <item name="Features" href="index.html#features"/>
             <item name="Documentation" href="index.html#documentation"/>

Modified: struts/struts1/trunk/src/site/fml/faqs/kickstart.fml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/fml/faqs/kickstart.fml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/fml/faqs/kickstart.fml (original)
+++ struts/struts1/trunk/src/site/fml/faqs/kickstart.fml Sat Jul  1 19:48:15 2006
@@ -20,12 +20,12 @@
     <part id="general">
 
         <faq id="why">
-            <question>Why do we need Struts Action Framework?"</question>
+            <question>Why do we need Struts?"</question>
             <answer>
                 <p>Java technologies give developers a serious boost when
                     creating and maintaining applications to meet the demands
                     of today's public Web sites and enterprise intranets.
-                    Struts Action Framework combines standard Java
+                    Struts combines standard Java
                     technologies into a unified framework. The end result is a
                     cooperative, synergistic framework, suitable for
                     development teams, independent developers, and everyone in
@@ -36,12 +36,12 @@
         </faq>
 
         <faq id="how">
-            <question>How does Struts Action Framework work?</question>
+            <question>How does Struts work?</question>
             <answer>
                 <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 Action Framework uses a special
+                    applications. Struts 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
@@ -50,7 +50,7 @@
         </faq>
 
         <faq id="compat">
-            <question>Is Struts Action Framework compatible with other Java
+            <question>Is Struts compatible with other Java
                 technologies?</question>
             <answer>
                 <p>Yes. Struts is committed to supporting industry standards.
@@ -60,7 +60,7 @@
         </faq>
 
         <faq id="who">
-            <question>Who wrote Struts Action Framework"</question>
+            <question>Who wrote Struts"</question>
             <answer>
                 <p>There are several
                     <a href="http://struts.apache.org/volunteers.html">active committers</a>
@@ -84,14 +84,14 @@
                 <p>After serving as the co-lead of the JSR 127 specification
                     (JavaServerFaces), Craig created another rendition of
                     Struts
-                    based on JavaServerFaces, called Shale. Both Struts Action
+                    based on JavaServerFaces, called Shale. Both Struts
                     Framework and Struts Shale are first-class citizens of the
                     Apache Struts project.</p>
             </answer>
         </faq>
 
         <faq id="first">
-            <question>Was Struts Action the first web application framework
+            <question>Was Struts the first web application framework
                 for Java?</question>
             <answer>
                 <p>No, not by a long shot. When Struts 1.0 shipped in June
@@ -106,10 +106,10 @@
         </faq>
 
         <faq id="popular">
-            <question>Is Struts Action the most popular web application
+            <question>Is Struts the most popular web application
                 framework for Java?</question>
             <answer>
-                <p>Yes. By any objective measure, Struts Action continues to
+                <p>Yes. By any objective measure, Struts continues to
                     be the most popular web application framework for
                     Java.</p>
                 <p>As of 2006, the vast majority of job offerings for Java
@@ -123,7 +123,7 @@
                 <p>While some people characterize the space of Java web
                     application framework as being "fragmented", the truth is
                     that
-                    <b>more web developers use Struts Action than all other
+                    <b>more web developers use Struts than all other
                         alternatives combined.</b>
                     This observation is as true in 2006 as it was in 2005,
                     as it was in 2004. It's probably been true since Struts
@@ -138,22 +138,22 @@
                     applications
                     grow in complexity, Struts Shale is ready to do for
                     <em>JSF</em>
-                    developers what Struts Action has
+                    developers what Struts has
                     been doing for
                     <em>JSP</em>
                     developers, year after year
                     after year.
                 </p>
                 <p>Meanwhile, enterprise web developers who have standardized
-                    on Struts Action can be assured that new releases of
+                    on Struts can be assured that new releases of
                     Action 1 will continue, even as we break new ground with
-                    the upcoming release of Struts Action 2 (formerly known as
+                    the upcoming release of Struts 2 (formerly known as
                     WebWork).</p>
             </answer>
         </faq>
 
         <faq id="where">
-            <question>Where can I get a copy of Struts Action
+            <question>Where can I get a copy of Struts
                 Framework?</question>
             <answer>
                 <p>The best place to download Apache Struts products is at
@@ -165,7 +165,7 @@
         </faq>
 
         <faq id="install">
-            <question>How do I install Struts Action Framework?</question>
+            <question>How do I install Struts?</question>
             <answer>
                 <p>To develop applications with Struts, you can usually just
                     add the Struts JAR file
@@ -180,8 +180,8 @@
                     is provided, which you can just copy to get a quick-start
                     on your own brainchild.
                 </p>
-                <p>Aside from the Struts Action Framework jar, the blank
-                    application includes the other Struts Action Framework
+                <p>Aside from the Struts jar, the blank
+                    application includes the other Struts
                     Library JARs and dependencies.
                     All dependencies are compatible with the Apache License.
                 </p>
@@ -256,11 +256,11 @@
         </faq>
 
         <faq id="tests">
-            <question>Does Struts Action Framework include its own unit
+            <question>Does Struts include its own unit
                 tests?</question>
             <answer>
                 <p>
-                    Struts Action Framework currently has two testing
+                    Struts currently has two testing
                     environments, to reflect the fact that
                     some things can be tested statically, and some really need
                     to be done in

Modified: struts/struts1/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/site.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/site.xml (original)
+++ struts/struts1/trunk/src/site/site.xml Sat Jul  1 19:48:15 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="Struts Action Framework">
+<project name="Struts">
     <bannerLeft>
         <name>Apache Software Foundation</name>
         <src>http://www.apache.org/images/asf-logo.gif</src>
@@ -13,11 +13,10 @@
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org" /> 
-            <item name="Action 1" href="http://struts.apache.org/struts-action" />
-            <item name="Action 2" href="http://struts.apache.org/struts-action2" />
-            <item name="Shale" href="http://struts.apache.org/struts-shale" /> 
+            <item name="Struts 1" href="http://struts.apache.org/1.x" />
+            <item name="Struts 2" href="http://struts.apache.org/2.0" />
         </links>
-        <menu name="Struts Action Framework 1">
+        <menu name="Struts 1">
             <item
                     name="Welcome"
                     href="index.html"
@@ -54,7 +53,7 @@
                     />        
             <item
                     name="Source Repository"
-                    href="http://svn.apache.org/viewcvs.cgi/struts/action/trunk/?root=Apache-SVN"
+                    href="http://svn.apache.org/viewcvs.cgi/struts/struts1/trunk/?root=Apache-SVN"
                     />
         </menu>
         
@@ -78,37 +77,6 @@
             <item   name="Struts Tiles"
                     href="struts-tiles/index.html" />
 
-        </menu>
-
-        <menu name="Site Archive">
-            <item
-                    name="Struts 1.2.x"
-                    href="http://struts.apache.org/struts-doc-1.2.x/index.html"
-                    />
-            <item
-                    name="Struts 1.2.9"
-                    href="http://struts.apache.org/struts-doc-1.2.9/index.html"
-                    />
-            <item
-                    name="Struts 1.2.8"
-                    href="http://struts.apache.org/struts-doc-1.2.8/index.html"
-                    />
-            <item
-                    name="Struts 1.2.7"
-                    href="http://struts.apache.org/struts-doc-1.2.7/index.html"
-                    />
-            <item
-                    name="Struts 1.2.4"
-                    href="http://struts.apache.org/struts-doc-1.2.4/index.html"
-                    />
-            <item
-                    name="Struts 1.1"
-                    href="http://struts.apache.org/struts-doc-1.1/index.html"
-                    />
-            <item
-                    name="Struts 1.0.2"
-                    href="http://struts.apache.org/struts-doc-1.0.2/index.html"
-                    />
         </menu>
 
         ${reports}

Modified: struts/struts1/trunk/src/site/xdoc/apidocs/index.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/apidocs/index.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/apidocs/index.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/apidocs/index.xml Sat Jul  1 19:48:15 2006
@@ -19,17 +19,17 @@
 <document>
 
    <properties>
-      <title>Struts Action - Javadoc</title>
+      <title>Struts - Javadoc</title>
    </properties>
 
    <body>
 
-      <section name="Struts Action Javadoc">
+      <section name="Struts Javadoc">
 
          <ul>
             <li>
                <a href="../struts-core/apidocs/index.html" target="_blank">
-               Struts Action Core</a></li>
+               Struts Core</a></li>
             <li>
                <a href="../struts-el/apidocs/index.html" target="_blank">
                Struts EL</a></li>

Modified: struts/struts1/trunk/src/site/xdoc/checkstyle.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/checkstyle.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/checkstyle.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/checkstyle.xml Sat Jul  1 19:48:15 2006
@@ -24,12 +24,12 @@
 
     <body>
 
-        <section name="Struts Action - Checkstyle">
+        <section name="Struts - Checkstyle">
 
          <ul>
             <li>
                <a href="struts-core/checkstyle.html">
-               Struts Action Core</a></li>
+               Struts Core</a></li>
             <li>
                <a href="struts-el/checkstyle.html">
                Struts EL</a></li>

Modified: struts/struts1/trunk/src/site/xdoc/dependencies.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/dependencies.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/dependencies.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/dependencies.xml Sat Jul  1 19:48:15 2006
@@ -24,12 +24,12 @@
 
     <body>
 
-        <section name="Struts Action - Dependencies">
+        <section name="Struts - Dependencies">
 
          <ul>
             <li>
                <a href="struts-core/dependencies.html" target="_blank">
-               Struts Action Core</a></li>
+               Struts Core</a></li>
             <li>
                <a href="struts-el/dependencies.html" target="_blank">
                Struts EL</a></li>

Modified: struts/struts1/trunk/src/site/xdoc/faqs/apps.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/faqs/apps.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/faqs/apps.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/faqs/apps.xml Sat Jul  1 19:48:15 2006
@@ -27,7 +27,7 @@
                 <p>
                     This document outlines one possible sequence of
                     development steps that can be followed to create a
-                    Struts Action Framework application. It is not intended as
+                    Struts application. It is not intended as
                     a complete description of each
                     referenced development activity. More detailed
                     documentation is available

Modified: struts/struts1/trunk/src/site/xdoc/faqs/db-howto.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/faqs/db-howto.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/faqs/db-howto.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/faqs/db-howto.xml Sat Jul  1 19:48:15 2006
@@ -93,7 +93,7 @@
                 memory.
                 Other implementations could be defined and used instead,
                 without
-                changing any of the Struts Action classes.
+                changing any of the Struts classes.
             </p>
 
             <p>
@@ -313,7 +313,7 @@
                 as they use conventional JavaBean properties.
                 (See
                 <strong>DynaActionForm classes</strong>
-                in the Struts Action User Guide for details.)
+                in the Struts User Guide for details.)
             </p>
 
             <p>

Modified: struts/struts1/trunk/src/site/xdoc/faqs/eclipse.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/faqs/eclipse.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/faqs/eclipse.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/faqs/eclipse.xml Sat Jul  1 19:48:15 2006
@@ -20,21 +20,21 @@
 <document>
 
     <properties>
-        <title>How to setup a basic Struts Action Framework project using
+        <title>How to setup a basic Struts project using
             Eclipse IDE</title>
     </properties>
 
     <body>
 
         <section
-                name="How to setup a basic Struts Action Framework project using Eclipse IDE">
+                name="How to setup a basic Struts 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 Action framework. This is mainly geared toward
+                    the Struts 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

Modified: struts/struts1/trunk/src/site/xdoc/faqs/navigation.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/faqs/navigation.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/faqs/navigation.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/faqs/navigation.xml Sat Jul  1 19:48:15 2006
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<project name="Struts Action Framework">
+<project name="Struts">
 
-    <title>Apache Struts - Struts Action Framework - FAQs and HOWTOs</title>
+    <title>Apache Struts - Struts - FAQs and HOWTOs</title>
     <body>
         <menu name="FAQs">
             <item
@@ -13,7 +13,7 @@
                     name="Newbie FAQ"/>
             <item
                     href="faqs/works.html"
-                    name="How Does Struts Action Work?"/>
+                    name="How Does Struts Work?"/>
         </menu>
 
         <menu name="HOWTOs">
@@ -50,7 +50,7 @@
                     name="Source Repository"
                     href="http://svn.apache.org/viewcvs.cgi/struts/action/trunk/?root=Apache-SVN"/>
             <item
-                    name="Struts Action Home"
+                    name="Struts Home"
                     href="index.html"/>
         </menu>
     </body>

Modified: struts/struts1/trunk/src/site/xdoc/faqs/netbeans40.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/faqs/netbeans40.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/faqs/netbeans40.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/faqs/netbeans40.xml Sat Jul  1 19:48:15 2006
@@ -20,14 +20,14 @@
 <document>
 
     <properties>
-        <title>How to setup a basic Struts Action Framework project using
+        <title>How to setup a basic Struts project using
             NetBeans IDE 4.0</title>
     </properties>
 
     <body>
 
         <section href="netbeans"
-                 name="How to setup a basic Struts Action project using NetBeans IDE 4.0"/>
+                 name="How to setup a basic Struts project using NetBeans IDE 4.0"/>
         <section name="Legal Disclamer">
 
             Please read
@@ -204,7 +204,7 @@
         </section>
 
         <section name="Let's set up a blank application">
-            Now you will use wizards to set up a new Struts Action Framework
+            Now you will use wizards to set up a new Struts
             application in NetBeans IDE 4.0, again in 5 steps.
             <br/>
             <br/>

Modified: struts/struts1/trunk/src/site/xdoc/faqs/works.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/faqs/works.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/faqs/works.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/faqs/works.xml Sat Jul  1 19:48:15 2006
@@ -31,7 +31,7 @@
                     browsers.
                     Server pages are designed to create dynamic Web pages that
                     can turn billboard sites into live applications.
-                    Struts Action Framework uses a special Servlet as a
+                    Struts 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,

Modified: struts/struts1/trunk/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/index.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/index.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/index.xml Sat Jul  1 19:48:15 2006
@@ -19,16 +19,16 @@
 <document>
 
     <properties>
-        <title>Struts Action Framework 1</title>
+        <title>Struts 1</title>
     </properties>
 
     <body>
 
-        <section name="Welcome to Struts Action Framework">
+        <section name="Welcome to Struts 1.x">
             <a name="Welcome"/>
 
             <p>
-                Struts Action Framework is a flexible control layer based on
+                Struts is a flexible control layer based on
                 <a href="userGuide/preface.html">standard technologies</a>
                 like Java
                 Servlets, JavaBeans, ResourceBundles, and XML, as well as
@@ -42,7 +42,7 @@
                 based on published standards and proven design patterns.
             </p>
 
-            <subsection name="Struts Action Framework in a Nutshell">
+            <subsection name="Struts in a Nutshell">
                 <a name="nutshell"/>
 
                 <p>
@@ -205,7 +205,7 @@
                 </p>
 
                 <p>
-                    Struts Action Framework is extensible.
+                    Struts is extensible.
                     Every class deployed by the framework can be replaced by
                     your own default class.
                     The properties of your default class can be set using the
@@ -233,7 +233,7 @@
             </subsection>
 
             <subsection
-                    name="Is Struts Action Framework the best choice for every project?">
+                    name="Is Struts the best choice for every project?">
 
                 <p>
                     No. If you need to write a very simple application, with a
@@ -247,8 +247,8 @@
                 <p>
                     But, if you are writing a more complicated application,
                     with dozens of pages,
-                    that need to be maintained over time, then Struts Action
-                    Framework can help.
+                    that need to be maintained over time, then Struts
+                    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">
@@ -262,7 +262,7 @@
         <section>
             <p class="right">
                 Next:
-                <a href="learning.html">Learning about Struts Action
+                <a href="learning.html">Learning about Struts
                     Framework</a>
             </p>
         </section>

Modified: struts/struts1/trunk/src/site/xdoc/jxr.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/jxr.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/jxr.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/jxr.xml Sat Jul  1 19:48:15 2006
@@ -24,12 +24,12 @@
 
     <body>
 
-        <section name="Struts Action - Source Xref">
+        <section name="Struts - Source Xref">
 
          <ul>
             <li>
                <a href="struts-core/jxr.html" target="_blank">
-               Struts Action Core</a></li>
+               Struts Core</a></li>
             <li>
                <a href="struts-el/jxr.html" target="_blank">
                Struts EL</a></li>

Modified: struts/struts1/trunk/src/site/xdoc/learning.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/learning.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/learning.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/learning.xml Sat Jul  1 19:48:15 2006
@@ -25,7 +25,7 @@
     <body>
 
         <a name="Docs"/>
-        <section name="Learning About Struts Action Framework">
+        <section name="Learning About Struts">
 
             <p>
                 The
@@ -183,7 +183,7 @@
             </subsection>
 
             <a name="Examples"/>
-            <subsection name="Struts Action Framework by Example">
+            <subsection name="Struts by Example">
                 <p>
                     To help you see how it all fits together, 
                     several example applications
@@ -281,7 +281,7 @@
             </subsection>
 
             <a name="More"/>
-            <subsection name="Learning More About Struts Action Framework">
+            <subsection name="Learning More About Struts">
                 <p>
                     The Apache Struts
                     <a href="http://struts.apache.org/mail.html">Mailing
@@ -372,12 +372,12 @@
             </subsection>
 
             <a name="books"/>
-            <subsection name="Books about Struts Action Framework">
+            <subsection name="Books about Struts">
 
                 <p>
                     The Apache Software Foundation does not provide printed
                     manuals,
-                    but several third-party books about Struts Action Framework are
+                    but several third-party books about Struts are
                     available.
                     Visit <a href="http://www.StrutsCentral.net/Resources/Action/books.html">
                     Struts Central</a> 

Modified: struts/struts1/trunk/src/site/xdoc/roadmap.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/roadmap.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/roadmap.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/roadmap.xml Sat Jul  1 19:48:15 2006
@@ -29,7 +29,7 @@
 
                 <p>
                     This document outlines some of changes we expect to
-                    see in future releases of Struts Action Framework and
+                    see in future releases of Struts and
                     related subprojects.
                 </p>
 
@@ -74,7 +74,7 @@
             </subsection>
 
             <a name="Struts_1_x"/>
-            <subsection name="Struts Action Framework 1.x">
+            <subsection name="Struts 1.x">
 
                 <p>
                     Releases in the 1.x series will focus on refactoring of

Modified: struts/struts1/trunk/src/site/xdoc/userGuide/building_controller.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/userGuide/building_controller.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/userGuide/building_controller.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/userGuide/building_controller.xml Sat Jul  1 19:48:15 2006
@@ -1561,7 +1561,7 @@
                     The framework should be viewed as simply the
                     <strong>foundation</strong>
                     for implementing MVC in your applications.
-                    Struts Action Framework provides a useful control layer,
+                    Struts provides a useful control layer,
                     but it is not a fully
                     featured platform for building MVC applications, soup to
                     nuts.

Modified: struts/struts1/trunk/src/site/xdoc/userGuide/configuration.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/userGuide/configuration.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/userGuide/configuration.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/userGuide/configuration.xml Sat Jul  1 19:48:15 2006
@@ -896,7 +896,7 @@
                 <p>
                     <strong>Note:</strong>
                     The material in this section is not specific to
-                    Struts Action Framework.
+                    Struts.
                     The configuration of servlet mappings is defined in the
                     Java Servlet
                     Specification.
@@ -1241,7 +1241,7 @@
                     Logging is
                     configured and used. Instead, it focuses on pertinent
                     details of using
-                    Commons Logging in connection with the Struts Action
+                    Commons Logging in connection with the Struts
                     Framework. For complete documentation
                     on using Commons Logging, consult the documentation for
                     the logging system

Modified: struts/struts1/trunk/src/site/xdoc/userGuide/installation.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/userGuide/installation.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/userGuide/installation.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/userGuide/installation.xml Sat Jul  1 19:48:15 2006
@@ -114,7 +114,7 @@
             <subsection name="Install a Library Distribution"
                         href="Installing">
 
-                <p>First, download a binary distribution of Struts Action
+                <p>First, download a binary distribution of Struts
                     Framework Library by following the
                     instructions
                     <a href="http://struts.apache.org/downloads.html">here,</a>
@@ -168,7 +168,7 @@
                     </li>
                 </ul>
 
-                <p>To use Struts Action Library in your own application, you
+                <p>To use Struts Library in your own application, you
                     will need to follow
                     these steps:</p>
                 <ul>

Modified: struts/struts1/trunk/src/site/xdoc/userGuide/introduction.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/userGuide/introduction.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/userGuide/introduction.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/userGuide/introduction.xml Sat Jul  1 19:48:15 2006
@@ -28,7 +28,7 @@
 
             <a name="history"/>
             <subsection
-                    name="1.1 Forward into the Past! (or a brief history of Struts Action)"
+                    name="1.1 Forward into the Past! (or a brief history of Struts)"
                     href="history">
 
                 <p>
@@ -318,7 +318,7 @@
                     href="controllerConcepts">
 
                 <p>
-                    Struts Action Framework provides the
+                    Struts provides the
                     <em>Controller</em>
                     portion of the application.
                     The Controller is focused on receiving

Modified: struts/struts1/trunk/src/site/xdoc/userGuide/navigation.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/userGuide/navigation.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/userGuide/navigation.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/userGuide/navigation.xml Sat Jul  1 19:48:15 2006
@@ -3,7 +3,7 @@
          href="http://struts.apache.org/userGuide"
          image="../images/struts.gif"
          authors="false">
-    <title>Apache Struts - Struts Action Framework 1 - User Guide</title>
+    <title>Apache Struts - Struts 1 - User Guide</title>
     <body>
         <menu name="Action Framework User Guide">
             <item
@@ -55,7 +55,7 @@
                     name="Source Repository"
                     href="http://svn.apache.org/viewcvs.cgi/struts/action/trunk/?root=Apache-SVN"/>
             <item
-                    name="Struts Action Framework Home"
+                    name="Struts Home"
                     href="index.html"/>
         </menu>
     </body>

Modified: struts/struts1/trunk/src/site/xdoc/userGuide/release-notes-1_3_1.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/userGuide/release-notes-1_3_1.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/userGuide/release-notes-1_3_1.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/userGuide/release-notes-1_3_1.xml Sat Jul  1 19:48:15 2006
@@ -138,7 +138,7 @@
                     to the Apache Struts PMC (Project Management Committee).
                 </p>
 
-                <h3>Struts Action Library</h3>
+                <h3>Struts Library</h3>
 
                 <p>
                     Since Struts 1.2.8, we have subdivided Struts into several
@@ -155,11 +155,11 @@
                 </p>
 
                 <p>
-                    Since many teams will use Struts Action Framework with one
+                    Since many teams will use Struts with one
                     or more extensions,
                     we are bundling the jars for extensions that utilize the
                     framework into a single distribution
-                    called "Struts Action Library".
+                    called "Struts Library".
                 </p>
 
                 <p>
@@ -173,7 +173,7 @@
 
                 <h4>Specification Changes</h4>
                 <p>
-                    The 1.3.x series of Struts Action Framework now has
+                    The 1.3.x series of Struts now has
                     a minumum requirement of the following specification
                     versions:
                     <ul>
@@ -255,7 +255,7 @@
                     </li>
                 </ul>
 
-                <h3>Struts Action Framework</h3>
+                <h3>Struts</h3>
 
                 <p>
                     Major changes to the framework include
@@ -428,7 +428,7 @@
                 </p>
 
                 <p>
-                    In Struts Action 1.3, the Cancel token is only honored if the
+                    In Struts 1.3, the Cancel token is only honored if the
                     new property "cancellable" is set for the Action Mapping.
                     If the Cancel token is present, but cancellable is not set,
                     then an InvalidCancelException is thrown.
@@ -459,7 +459,7 @@
                 <p>
                     Note that the Opt-In Cancel Handler is available for the
                     Composable Request Processor as well as
-                    the legacy Request Processor included in Struts Action 1.3.
+                    the legacy Request Processor included in Struts 1.3.
                 </p>
 
                 <a name="enhanced-exception" />

Modified: struts/struts1/trunk/src/site/xdoc/userGuide/release-notes-1_3_2.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/userGuide/release-notes-1_3_2.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/userGuide/release-notes-1_3_2.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/userGuide/release-notes-1_3_2.xml Sat Jul  1 19:48:15 2006
@@ -53,7 +53,7 @@
             <subsection name="Introduction">
                 <p>
                     This section contains release notes for changes that have
-                    taken place to the Struts Action 1 project, previously known
+                    taken place to the Struts 1 project, previously known
                     as "Struts Classic" since 
                     <a href="release-notes-1_3_1.html">Version 1.3.1</a>.
                     To keep up-to-date on all changes to Struts, subscribe to
@@ -104,19 +104,19 @@
                     interfaces.
                 </p>
 
-                <h3>Struts Action Framework</h3>
+                <h3>Struts</h3>
 
                 <p>
-                    Since Struts 1.3.1, we have moved the Struts Action 1 related
-                    subprojects back into the Struts Action 1 project, leaving 
-                    Struts Action and Struts Shale the two remaining subprojects.
-                    The Struts Action 1.3.2 release contains the following seven
+                    Since Struts 1.3.1, we have moved the Struts 1 related
+                    subprojects back into the Struts 1 project, leaving 
+                    Struts and Struts Shale the two remaining subprojects.
+                    The Struts 1.3.2 release contains the following seven
                     components: Core, Applications, EL, Extras, Scripting, 
                     Taglibs, and Tiles.
                 </p>
 
                 <p>
-                    The Struts Action Framework, including the website, is being
+                    The Struts, including the website, is being
                     built with Maven 2.
                     But, of course, you can continue to build your own
                     projects any way you like!
@@ -126,7 +126,7 @@
 
                 <h4>Specification Changes</h4>
                 <p>
-                    The 1.3.x series of Struts Action Framework has
+                    The 1.3.x series of Struts has
                     a minumum requirement of the following specification
                     versions:
                     <ul>

Modified: struts/struts1/trunk/src/site/xdoc/userGuide/release-notes-1_3_3.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/userGuide/release-notes-1_3_3.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/userGuide/release-notes-1_3_3.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/userGuide/release-notes-1_3_3.xml Sat Jul  1 19:48:15 2006
@@ -53,7 +53,7 @@
             <subsection name="Introduction">
                 <p>
                     This section contains release notes for changes that have
-                    taken place to the Struts Action 1 project, previously known
+                    taken place to the Struts 1 project, previously known
                     as "Struts Classic" since 
                     <a href="release-notes-1_3_2.html">Version 1.3.2</a>.
                     To keep up-to-date on all changes to Struts, subscribe to
@@ -104,16 +104,16 @@
                     interfaces.
                 </p>
 
-                <h3>Struts Action Framework</h3>
+                <h3>Struts</h3>
 
                 <p>
-                    The Struts Action 1.3.3 release contains the following eight
+                    The Struts 1.3.3 release contains the following eight
                     components: Core, Applications, EL, Extras, Faces, 
                     Scripting, Taglib, and Tiles.
                 </p>
 
                 <p>
-                    The Struts Action Framework, including the website, is being
+                    The Struts, including the website, is being
                     built with Maven 2.
                     But, of course, you can continue to build your own
                     projects any way you like!
@@ -121,7 +121,7 @@
 
                 <h4>Specification Changes</h4>
                 <p>
-                    The 1.3.x series of Struts Action Framework has
+                    The 1.3.x series of Struts has
                     a minimum requirement of the following specification
                     versions:
                     <ul>
@@ -177,7 +177,7 @@
 <li>[<a href='http://issues.apache.org/struts/browse/STR-2850'>STR-2850</a>] - Add tests to confirm that example apps work</li>
 <li>[<a href='http://issues.apache.org/struts/browse/STR-2852'>STR-2852</a>] - Move the non-working integration tests to the sandbox for review.</li>
 <li>[<a href='http://issues.apache.org/struts/browse/STR-2860'>STR-2860</a>] - Change DOCTYPE in validator config files to v1.3.0</li>
-<li>[<a href='http://issues.apache.org/struts/browse/STR-2863'>STR-2863</a>] - Create a library distribution for Struts Action 1</li>
+<li>[<a href='http://issues.apache.org/struts/browse/STR-2863'>STR-2863</a>] - Create a library distribution for Struts 1</li>
 </ul>
             
             </subsection>

Modified: struts/struts1/trunk/src/site/xdoc/userGuide/release-notes.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/userGuide/release-notes.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/userGuide/release-notes.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/userGuide/release-notes.xml Sat Jul  1 19:48:15 2006
@@ -53,7 +53,7 @@
             <subsection name="Introduction">
                 <p>
                     This section contains release notes for changes that have
-                    taken place to Struts Action Framework,
+                    taken place to Struts,
                     since the
                     <a href="release-notes-1_3_3.html">Version 1.3.3</a>
                     distribution.
@@ -104,16 +104,16 @@
                     interfaces.
                 </p>
 
-                <h3>Struts Action Framework</h3>
+                <h3>Struts</h3>
 
                 <p>
-                    The Struts Action 1.3.4 distribution contains the following eight
+                    The Struts 1.3.4 distribution contains the following eight
                     components: Core, Applications, EL, Extras, Faces, 
                     Scripting, Taglib, and Tiles.
                 </p>
 
                 <p>
-                    The Struts Action Framework, including the website, is being
+                    The Struts, including the website, is being
                     built with Maven 2.
                     But, of course, you can continue to build your own
                     projects any way you like!
@@ -121,7 +121,7 @@
 
                 <h4>Specification Changes</h4>
                 <p>
-                    The 1.3.x series of Struts Action Framework has
+                    The 1.3.x series of Struts has
                     a minimum requirement of the following specification
                     versions:
                     <ul>

Modified: struts/struts1/trunk/taglib/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/pom.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/taglib/pom.xml (original)
+++ struts/struts1/trunk/taglib/pom.xml Sat Jul  1 19:48:15 2006
@@ -39,7 +39,7 @@
    <distributionManagement>
       <site>
          <id>apache-site</id>
-         <url>scp://people.apache.org/www/struts.apache.org/struts/struts-taglib</url>
+         <url>scp://people.apache.org/www/struts.apache.org/1.x/struts-taglib</url>
       </site>
    </distributionManagement>
 

Modified: struts/struts1/trunk/taglib/src/site/site.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/site/site.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/taglib/src/site/site.xml (original)
+++ struts/struts1/trunk/taglib/src/site/site.xml Sat Jul  1 19:48:15 2006
@@ -13,8 +13,8 @@
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org" /> 
-            <item name="Action" href="http://struts.apache.org/struts-action" /> 
-            <item name="Shale" href="http://struts.apache.org/struts-shale" /> 
+            <item name="Struts 1" href="http://struts.apache.org/1.x" />
+            <item name="Struts 2" href="http://struts.apache.org/2.0" />
         </links>
         <menu name="Struts JSP Taglib Guides">
             <item name="Bean" href="dev_bean.html"/>

Modified: struts/struts1/trunk/tiles/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/pom.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/tiles/pom.xml (original)
+++ struts/struts1/trunk/tiles/pom.xml Sat Jul  1 19:48:15 2006
@@ -39,7 +39,7 @@
    <distributionManagement>
       <site>
          <id>apache-site</id>
-         <url>scp://people.apache.org/www/struts.apache.org/struts/struts-tiles</url>
+         <url>scp://people.apache.org/www/struts.apache.org/1.x/struts-tiles</url>
       </site>
    </distributionManagement>
 

Modified: struts/struts1/trunk/tiles/src/site/site.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/site/site.xml?rev=418542&r1=418541&r2=418542&view=diff
==============================================================================
--- struts/struts1/trunk/tiles/src/site/site.xml (original)
+++ struts/struts1/trunk/tiles/src/site/site.xml Sat Jul  1 19:48:15 2006
@@ -13,9 +13,8 @@
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org" /> 
-            <item name="Action 1" href="http://struts.apache.org/struts-action" />
-            <item name="Action 2" href="http://struts.apache.org/struts-action2" />
-            <item name="Shale" href="http://struts.apache.org/struts-shale" /> 
+            <item name="Struts 1" href="http://struts.apache.org/1.x" />
+            <item name="Struts 2" href="http://struts.apache.org/2.0" />
         </links>
         <menu name="Struts Tiles">
             <item href="index.html" name="Tiles Home"/>