You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by hu...@apache.org on 2006/11/17 23:25:43 UTC

svn commit: r476343 - in /struts: site/src/site/ site/src/site/xdoc/ site/src/site/xdoc/dev/ struts1/trunk/src/site/ struts2/trunk/src/site/ struts2/trunk/src/site/xdoc/

Author: husted
Date: Fri Nov 17 14:25:42 2006
New Revision: 476343

URL: http://svn.apache.org/viewvc?view=rev&rev=476343
Log:
SITE-14 Second draft. 

Added:
    struts/site/src/site/xdoc/dev/builds.xml
      - copied, changed from r476295, struts/site/src/site/xdoc/builds.xml
    struts/site/src/site/xdoc/dev/bylaws.xml
      - copied unchanged from r476295, struts/site/src/site/xdoc/bylaws.xml
    struts/site/src/site/xdoc/dev/dev-mail.xml
      - copied, changed from r476295, struts/site/src/site/xdoc/dev-mail.xml
    struts/site/src/site/xdoc/dev/releases.xml
      - copied unchanged from r476295, struts/site/src/site/xdoc/releases.xml
    struts/site/src/site/xdoc/dev/site.xml
      - copied, changed from r476267, struts/site/src/site/site.xml
    struts/site/src/site/xdoc/dev/volunteers.xml
      - copied unchanged from r476295, struts/site/src/site/xdoc/volunteers.xml
Removed:
    struts/site/src/site/xdoc/builds.xml
    struts/site/src/site/xdoc/bylaws.xml
    struts/site/src/site/xdoc/dev-mail.xml
    struts/site/src/site/xdoc/releases.xml
    struts/site/src/site/xdoc/volunteers.xml
Modified:
    struts/site/src/site/site.xml
    struts/site/src/site/xdoc/downloads.xml
    struts/site/src/site/xdoc/mail.xml
    struts/struts1/trunk/src/site/site.xml
    struts/struts2/trunk/src/site/site.xml
    struts/struts2/trunk/src/site/xdoc/index.xml

Modified: struts/site/src/site/site.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/site.xml?view=diff&rev=476343&r1=476342&r2=476343
==============================================================================
--- struts/site/src/site/site.xml (original)
+++ struts/site/src/site/site.xml Fri Nov 17 14:25:42 2006
@@ -23,7 +23,7 @@
                     href="http://struts.apache.org/1.x/" />
         </links>
 
-        <menu name="Apache Struts Framework">
+        <menu name="Apache Struts">
             <item
                     name="Welcome"
                     href="index.html"
@@ -46,7 +46,7 @@
                     />
         </menu>
 
-        <menu name="Product Documentation">
+        <menu name="Documentation">
             <item 
                     name="Key Technologies" 
                     href="primer.html" />
@@ -64,31 +64,7 @@
                     href="http://struts.apache.org/1.2.x/index.html"/>
         </menu>
         
-        <menu name="Past Releases">
-            <item 
-                    name="Struts 1.3.5" 
-                    href="http://struts.apache.org/1.3.5/index.html"/>
-            <item   
-                    name="Struts 1.2.9" 
-                    href="http://struts.apache.org/1.2.9/index.html"/>
-            <item   
-                    name="Struts 1.2.8" 
-                    href="http://struts.apache.org/1.2.8/index.html"/>
-            <item 
-                    name="Struts 1.2.7" 
-                    href="http://struts.apache.org/1.2.7/index.html"/>
-            <item 
-                    name="Struts 1.2.4" 
-                    href="http://struts.apache.org/1.2.4/index.html"/>
-            <item 
-                    name="Struts 1.1" 
-                    href="http://struts.apache.org/1.1/index.html"/>
-            <item 
-                    name="Struts 1.0.2" 
-                    href="http://struts.apache.org/1.0.2/index.html"/>
-        </menu>
-
-        <menu name="Product Support">
+        <menu name="Support">
             <item
                     name="User Mailing List"
                     href="mail.html"
@@ -99,32 +75,32 @@
                     />
         </menu>
 
-        <menu name="Product Development">
+        <menu name="Development">
             <item
                     name="How to Help FAQ"
                     href="helping.html"
                     />
 
             <item
-                    name="Dev Mailing List"
-                    href="dev-mail.html"
+                    name="Development Mailing List"
+                    href="dev\dev-mail.html"
                     />
             <item
-                    name="Nightly Builds"
-                    href="builds.html"
+                    name="Source Code"
+                    href="dev\builds.html"
                     />
                    
             <item
                     name="Release Guidelines"
-                    href="releases.html"
+                    href="dev\releases.html"
                     />
             <item
                     name="Volunteers"
-                    href="volunteers.html"
+                    href="dev\volunteers.html"
                     />
             <item
                     name="PMC Charter"
-                    href="bylaws.html"
+                    href="dev\bylaws.html"
                     />
             <item 
                     name="Sandbox" 

Copied: struts/site/src/site/xdoc/dev/builds.xml (from r476295, struts/site/src/site/xdoc/builds.xml)
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/dev/builds.xml?view=diff&rev=476343&p1=struts/site/src/site/xdoc/builds.xml&r1=476295&p2=struts/site/src/site/xdoc/dev/builds.xml&r2=476343
==============================================================================
--- struts/site/src/site/xdoc/builds.xml (original)
+++ struts/site/src/site/xdoc/dev/builds.xml Fri Nov 17 14:25:42 2006
@@ -19,25 +19,184 @@
 <document>
 
     <properties>
-        <title>Builds</title>
+        <title>Source Code</title>
     </properties>
 
     <body>
+        <a name="SourceCode"/>
+        <section name="Source Code">
+
+            <p>
+                As a convenience to developers who are helping to create and
+                maintain the Apache Struts framework,
+                public access to the live source code repository is available.
+                This is our one-and-only development repository.
+                Accordingly, the source may not always compile
+                or be in a release-ready state.
+                <em>Access at your own risk!</em>
+            </p>
+
+            <p>
+                NOTE: The full source code is provided with each
+                <a href="../downloads.html">release.</a> 
+                If you simply want to build your own copy of the product,
+                use the source code provided with an approved release, 
+                rather than the development head.
+            </p>
+
+            <p>
+                Read-only access to the Apache Struts source repository is available
+                through both
+                <a href="http://svn.apache.org/viewcvs.cgi/struts/?root=Apache-SVN">
+                    web browser</a>
+                and
+                <a href="http://subversion.tigris.org/">
+                    Subversion client</a>
+                interfaces.
+            </p>
+
+            <p>
+                To download the trunk (HEAD revision) of all Struts
+                subprojects,
+                a convenience directory has been added, named
+                <b>current</b>.
+                The current directory uses a Subversion feature called
+                externals which stores properties on the directory.
+                With those properties,
+                Subversion has all the information it needs to
+                automaticaly download
+                the head revision of all the Struts subprojects.
+            </p>
+
+            <p>
+                With the
+                <a href="http://subversion.tigris.org/">Subversion
+                    client</a>
+                installed, obtaining a working copy of the Struts codebase
+                is as simple as
+            </p>
+
+            <code>&gt; svn checkout
+                http://svn.apache.org/repos/asf/struts/current</code>
+
+            <p>
+                While Externals work well in practice, there are caveats.
+                For example,
+                since all the subdirectories are still really different
+                slices
+                from the repository,
+                relative paths might not work the way you expect.
+                For more, see the
+                <a href="http://svnbook.red-bean.com/en/1.1/ch07s04.html">
+                    Externals Definitions</a>
+                section of the
+                <a href="http://svnbook.red-bean.com/">Subversion Book</a>.
+            </p>
+
+            <p>
+                To check out individual sub-projects from the Subversion
+                repository,
+                you can specify one of the following URLs:
+            </p>
+
+            <ul>
+                <li>http://svn.apache.org/repos/asf/struts/struts1/trunk</li>
+                <li>http://svn.apache.org/repos/asf/struts/struts2/trunk</li>
+                <li>http://svn.apache.org/repos/asf/struts/sandbox/trunk</li>
+                <li>http://svn.apache.org/repos/asf/struts/site</li>
+            </ul>
+
+            <p>
+                (Committers with write access should use the
+                <strong>https</strong>
+                protocol instead.
+                See the ASF
+                <a href="http://www.apache.org/dev/version-control.html#https-svn">
+                    Source Code Repositories</a>
+                page for details.)
+            </p>
+
+            <p>
+                <strong>Warning:</strong>
+                If you try to check out everything under 'struts',
+                be aware that you will get not just the most recent code
+                ('trunk'),
+                but a copy of every tag and branch ever created
+                for Struts.
+                A complete checkout of Struts from day one, including all
+                the branches,
+                will take some time and might max out your disk volume!
+            </p>
+
+            <p>
+                For more about using version control systems at Apache,
+                see the ASF's
+                <a href="http://www.apache.org/dev/version-control.html#anon-svn">
+                    Source Code Repositories</a>
+                page.
+                For more about how Apache Struts uses Subversion, see our
+                <a href="http://wiki.apache.org/struts/StrutsMaintenanceSvn">
+                    Subversion wiki page</a>.
+            </p>
+
+        <a name="Building"/>
+        <subsection name="Building Apache Struts">
+
+            <p>
+                If you are building Apache Struts from source,
+                we recommend that you install and use
+                <a href="http://maven.apache.org">
+                    Apache Maven 2.</a>
+                During the build process, Maven will automatically acquire
+                whatever external JARs your system may need.
+                (Of course,
+                you can still use your build system of choice to build
+                your own applications!)
+            </p>
+
+            <p>
+                With Maven installed, building a Struts codebase is as
+                simple as
+            </p>
+
+            <code>/current/struts1/&gt; mvn install</code>
+
+            <p>
+            or
+            </p>
+
+            <code>/current/struts2/&gt; mvn install</code>
+
+            <p>
+                Maven will automatically download any dependencies as
+                needed.
+            </p>
+
+            <p>
+                For more about using Maven to build Struts 2,
+                see
+                <a href="2.x/WW/building-the-framework-from-source.html">Bulding the framework from source</a>
+                in the
+                <a href="2.x/WW/contributors-guide.html">Struts 2 Contributors Guide.</a>
+            </p>
+
+            <p>
+                For more about using Maven to build Struts 1,
+                see our
+                <a href="http://wiki.apache.org/struts/StrutsMaintenanceMaven">
+                    Maven wiki page.</a>
+            </p>
+
+        </subsection>
+        </section>
+
             <a name="NightlyBuilds"/>
             <section name="Nightly Builds">
 
                 <p>
-                    For developers who are helping to create and maintain
-                    the Apache Struts framework,
-                    the latest development build is made available each
-                    morning.
-                    <em>Use at your own risk!</em>
-                </p>
-
-                <p>
-                    If you do not plan to contribute to the development of the framework,
-                    then you probably want to download a
-                    <a href="downloads.html">Release</a> instead.
+                    As part of our continuous integration practice,
+                    we also make available each morning the latest development build.
+                    <em>Again: Use at your own risk!</em>
                 </p>
 
                 <ul>
@@ -49,10 +208,16 @@
                 </ul>
 
                 <p>
-                    Be sure to check the Release Notes for a nightly build,
-                    so you have a better idea of what you are getting!
+                    If you do not plan to contribute to the development of the framework,
+                    then you probably want to download a
+                    <a href="../downloads.html">Release</a> instead.
                 </p>
 
+              <p>
+                NOTE: The Struts 2 nightly build is not fully operational.
+                We suggest that contributors checkout the <a href="#SourceCode">source code</a> instead.
+              </p>
+
             </section>
             
             <a name="TestBuilds"/>
@@ -104,157 +269,6 @@
   &lt;/repository>
 &lt;/repositories></code></pre></p>
             </subsection>      
-            </section>
-
-
-            <a name="SourceCode"/>
-            <section name="Source Code">
-
-                <p>
-                    Access to the Apache Struts source repository is available
-                    through
-                    both
-                    <a href="http://svn.apache.org/viewcvs.cgi/struts/?root=Apache-SVN">
-                        web browser</a>
-                    and
-                    <a href="http://subversion.tigris.org/">
-                        Subversion client</a>
-                    interfaces.
-                </p>
-
-                <p>
-                    To download the trunk (HEAD revision) of all Struts
-                    subprojects,
-                    a convenience directory has been added, named
-                    <b>current</b>.
-                    The current directory uses a Subversion feature called
-                    externals which stores properties on the directory.
-                    With those properties,
-                    Subversion has all the information it needs to
-                    automaticaly download
-                    the head revision of all the Struts subprojects.
-                </p>
-
-                <p>
-                    With the
-                    <a href="http://subversion.tigris.org/">Subversion
-                        client</a>
-                    installed, obtaining a working copy of the Struts codebase
-                    is as simple as
-                </p>
-
-                <code>&gt; svn checkout
-                    http://svn.apache.org/repos/asf/struts/current</code>
-
-                <p>
-                    While Externals work well in practice, there are caveats.
-                    For example,
-                    since all the subdirectories are still really different
-                    slices
-                    from the repository,
-                    relative paths might not work the way you expect.
-                    For more, see the
-                    <a href="http://svnbook.red-bean.com/en/1.1/ch07s04.html">
-                        Externals Definitions</a>
-                    section of the
-                    <a href="http://svnbook.red-bean.com/">Subversion Book</a>.
-                </p>
-
-                <p>
-                    To check out individual sub-projects from the Subversion
-                    repository,
-                    you can specify one of the following URLs:
-                </p>
-
-                <ul>
-                    <li>http://svn.apache.org/repos/asf/struts/struts1/trunk</li>
-                    <li>http://svn.apache.org/repos/asf/struts/struts2/trunk</li>
-                    <li>http://svn.apache.org/repos/asf/struts/sandbox/trunk</li>
-                    <li>http://svn.apache.org/repos/asf/struts/site</li>
-                </ul>
-
-                <p>
-                    (Committers with write access should use the
-                    <strong>https</strong>
-                    protocol instead.
-                    See the ASF
-                    <a href="http://www.apache.org/dev/version-control.html#https-svn">
-                        Source Code Repositories</a>
-                    page for details.)
-                </p>
-
-                <p>
-                    <strong>Warning:</strong>
-                    If you try to check out everything under 'struts',
-                    be aware that you will get not just the most recent code
-                    ('trunk'),
-                    but a copy of every tag and branch ever created
-                    for Struts.
-                    A complete checkout of Struts from day one, including all
-                    the branches,
-                    will take some time and might max out your disk volume!
-                </p>
-
-                <p>
-                    For more about using version control systems at Apache,
-                    see the ASF's
-                    <a href="http://www.apache.org/dev/version-control.html#anon-svn">
-                        Source Code Repositories</a>
-                    page.
-                    For more about how Apache Struts uses Subversion, see our
-                    <a href="http://wiki.apache.org/struts/StrutsMaintenanceSvn">
-                        Subversion wiki page</a>.
-                </p>
-
-            <a name="Building"/>
-            <subsection name="Building Apache Struts">
-
-                <p>
-                    If you are building Apache Struts from source,
-                    we recommend that you install and use
-                    <a href="http://maven.apache.org">
-                        Apache Maven 2.</a>
-                    During the build process, Maven will automatically acquire 
-                    whatever external JARs your system may need.
-                    (Of course,
-                    you can still use your build system of choice to build
-                    your own applications!)
-                </p>
-
-                <p>
-                    With Maven installed, building a Struts codebase is as 
-                    simple as
-                </p>
-
-                <code>/current/struts1/&gt; mvn install</code>
-                
-                <p>
-                or
-                </p>
-                
-                <code>/current/struts2/&gt; mvn install</code>
-
-                <p>
-                    Maven will automatically download any dependencies as
-                    needed.
-                </p>
-
-                <p>
-                    For more about using Maven to build Struts 2,
-                    see 
-                    <a href="WW/building-the-framework-from-source.html">Bulding the framework from source</a>
-                    in the 
-                    <a href="WW/contributors-guide.html">Struts 2 Contributors Guide.</a>
-                </p>
-
-                <p>
-                    For more about using Maven to build Struts 1,
-                    see our
-                    <a href="http://wiki.apache.org/struts/StrutsMaintenanceMaven">
-                        Maven wiki page.</a>
-                </p>
-
-            </subsection>
             </section>
 
             <a name="Licensing"/>

Copied: struts/site/src/site/xdoc/dev/dev-mail.xml (from r476295, struts/site/src/site/xdoc/dev-mail.xml)
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/dev/dev-mail.xml?view=diff&rev=476343&p1=struts/site/src/site/xdoc/dev-mail.xml&r1=476295&p2=struts/site/src/site/xdoc/dev/dev-mail.xml&r2=476343
==============================================================================
--- struts/site/src/site/xdoc/dev-mail.xml (original)
+++ struts/site/src/site/xdoc/dev/dev-mail.xml Fri Nov 17 14:25:42 2006
@@ -28,10 +28,10 @@
 
             <p>
                 The project hosts several mailing lists. The
-                <a href="mail.html">user list</a> is devoted to product support. 
+                <a href="../mail.html">user list</a> is devoted to product support. 
                 The project also hosts several <bold>product development</bold> lists.
                 <strong>For help using Struts,
-                subscribe to <a href="mail.html">user list.</a></strong>
+                subscribe to <a href="../mail.html">user list.</a></strong>
             </p>
             
 

Copied: struts/site/src/site/xdoc/dev/site.xml (from r476267, struts/site/src/site/site.xml)
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/dev/site.xml?view=diff&rev=476343&p1=struts/site/src/site/site.xml&r1=476267&p2=struts/site/src/site/xdoc/dev/site.xml&r2=476343
==============================================================================
--- struts/site/src/site/site.xml (original)
+++ struts/site/src/site/xdoc/dev/site.xml Fri Nov 17 14:25:42 2006
@@ -23,82 +23,6 @@
                     href="http://struts.apache.org/1.x/" />
         </links>
 
-        <menu name="Apache Struts Framework">
-            <item
-                    name="Welcome"
-                    href="index.html"
-                    />
-            <item
-                    name="Releases"
-                    href="downloads.html"
-                    />
-            <item
-                    name="Kickstart FAQ"
-                    href="kickstart.html"
-                    />
-            <item
-                    name="Roadmap FAQ"
-                    href="roadmap.html"
-                    />
-            <item
-                    name="Website Stats"
-                    href="http://people.apache.org/~vgritsenko/stats/projects/struts"
-                    />
-        </menu>
-
-        <menu name="Product Documentation">
-            <item 
-                    name="Key Technologies" 
-                    href="primer.html" />
-            <item 
-                    name="Javadoc Index" 
-                    href="javadoc.html" />
-            <item   
-                    name="Struts 2.x" 
-                    href="http://struts.apache.org/2.x/index.html"/>
-            <item 
-                    name="Struts 1.3" 
-                    href="http://struts.apache.org/1.x/index.html"/>
-            <item   
-                    name="Struts 1.2" 
-                    href="http://struts.apache.org/1.2.x/index.html"/>
-        </menu>
-        
-        <menu name="Past Releases">
-            <item 
-                    name="Struts 1.3.5" 
-                    href="http://struts.apache.org/1.3.5/index.html"/>
-            <item   
-                    name="Struts 1.2.9" 
-                    href="http://struts.apache.org/1.2.9/index.html"/>
-            <item   
-                    name="Struts 1.2.8" 
-                    href="http://struts.apache.org/1.2.8/index.html"/>
-            <item 
-                    name="Struts 1.2.7" 
-                    href="http://struts.apache.org/1.2.7/index.html"/>
-            <item 
-                    name="Struts 1.2.4" 
-                    href="http://struts.apache.org/1.2.4/index.html"/>
-            <item 
-                    name="Struts 1.1" 
-                    href="http://struts.apache.org/1.1/index.html"/>
-            <item 
-                    name="Struts 1.0.2" 
-                    href="http://struts.apache.org/1.0.2/index.html"/>
-        </menu>
-
-        <menu name="Product Support">
-            <item
-                    name="User Mailing List"
-                    href="mail.html"
-                    />
-            <item
-                    name="Issue Tracker (JIRA)"
-                    href="http://issues.apache.org/struts/"
-                    />
-        </menu>
-
         <menu name="Product Development">
             <item
                     name="How to Help FAQ"
@@ -136,90 +60,6 @@
                     />
         </menu>
 
-        <menu name="Related Projects">
-            <item
-                    name="Apache Beehive"
-                    href="http://beehive.apache.org/"
-                    />
-            <item
-                    name="Apache MyFaces"
-                    href="http://myfaces.apache.org/"
-                    />
-            <item
-                    name="Apache Tomcat"
-                    href="http://tomcat.apache.org/"
-                    />
-            <item
-                    name="Jakarta Commons"
-                    href="http://jakarta.apache.org/commons/"
-                    />
-            <item
-                    name="Velocity Struts"
-                    href="http://jakarta.apache.org/velocity/tools/struts/"
-                    />
-        </menu>
-
-        <menu name="Similar Projects">
-
-            <item
-                    name="Apache Cocoon"
-                    href="http://cocoon.apache.org/"
-                    />
-            <item
-                    name="Apache Shale"
-                    href="http://shale.apache.org/"
-                    />
-            <item
-                    name="Apache Tapestry"
-                    href="http://tapestry.apache.org/"
-                    />
-            <item
-                    name="Jakarta Turbine"
-                    href="http://jakarta.apache.org/turbine/"
-                    />
-            <item
-                    name="Spring MVC"
-                    href="http://www.springframework.org/docs/reference/mvc.html"
-                    />
-            <item
-                    name="Stripes"
-                    href="http://stripes.mc4j.org/confluence/display/stripes/Home"
-                    />
-            <item
-                    name="Wicket"
-                    href="http://wicket.sourceforge.net/"
-                    />
-         </menu>
-
-        <menu name="Java 5">
-            <item
-                    name="Strecks"
-                    href="http://strecks.sourceforge.net//"
-                    />
-         </menu>
-
-
-        <menu name="See Also">
-            <item
-                    name="Apache Bookstore"
-                    href="http://www.ApacheBookstore.com/"
-                    />
-            <item
-                    name="Planet Struts"
-                    href="http://www.PlanetStruts.org/"
-                    />
-
-            <item
-                    name="Struts Central"
-                    href="http://www.StrutsCentral.net/"
-                    />
-
-            <item
-                    name="Struts SourceForge"
-                    href="http://struts.SourceForge.net/"
-                    />
-
-        </menu>
 
     </body>
 </project>

Modified: struts/site/src/site/xdoc/downloads.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/downloads.xml?view=diff&rev=476343&r1=476342&r2=476343
==============================================================================
--- struts/site/src/site/xdoc/downloads.xml (original)
+++ struts/site/src/site/xdoc/downloads.xml Fri Nov 17 14:25:42 2006
@@ -102,7 +102,40 @@
             
             </section>
 
-            <a name="Licensing"/>
+        <section name="Prior Releases">
+
+            <p>
+                As a convenience, we retain archival copies of the website for each "General Availablity" release.
+                Product support for older releases may be limited.
+            </p>
+
+            <ul>
+                <li>
+                    <a href="http://struts.apache.org/1.3.5/index.html">Struts 1.3.5</a>
+                </li>
+                <li>
+                    <a href="http://struts.apache.org/1.2.9/index.html">Struts 1.2.9</a>
+                </li>
+                <li>
+                    <a href="http://struts.apache.org/1.2.8/index.htm">Struts 1.2.8</a>
+                </li>
+                <li>
+                    <a href="http://struts.apache.org/1.2.7/index.html">Struts 1.2.7</a>
+                </li>
+                <li>
+                    <a href="http://struts.apache.org/1.2.4/index.html">Struts 1.2.4</a>
+                </li>
+                <li>
+                    <a href="http://struts.apache.org/1.1/index.htm">Struts 1.1</a>
+                </li>
+                <li>
+                    <a href="http://struts.apache.org/1.0.2/index.html">Struts 1.0.2</a>
+                </li>
+            </ul>
+            
+        </section>
+
+        <a name="Licensing"/>
             <section name="Licensing of Apache Struts Releases">
                 <p>        
                     Apache Struts 2 source code and documentation is 

Modified: struts/site/src/site/xdoc/mail.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/mail.xml?view=diff&rev=476343&r1=476342&r2=476343
==============================================================================
--- struts/site/src/site/xdoc/mail.xml (original)
+++ struts/site/src/site/xdoc/mail.xml Fri Nov 17 14:25:42 2006
@@ -398,7 +398,7 @@
                 
                 <p>
                     <em>To subscribe to the Dev list,
-                    please visit the <a href="dev-mail.html">
+                    please visit the <a href="dev/dev-mail.html">
                     product development</a> area.</em>
                 </p>
 

Modified: struts/struts1/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/site.xml?view=diff&rev=476343&r1=476342&r2=476343
==============================================================================
--- struts/struts1/trunk/src/site/site.xml (original)
+++ struts/struts1/trunk/src/site/site.xml Fri Nov 17 14:25:42 2006
@@ -57,7 +57,7 @@
                     />        
         </menu>
         
-        <menu name="Product Support">
+        <menu name="Support">
             <item
                     name="User Mailing List"
                     href="http://struts.apache.org/mail.html"

Modified: struts/struts2/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/src/site/site.xml?view=diff&rev=476343&r1=476342&r2=476343
==============================================================================
--- struts/struts2/trunk/src/site/site.xml (original)
+++ struts/struts2/trunk/src/site/site.xml Fri Nov 17 14:25:42 2006
@@ -30,45 +30,31 @@
         
             <item
                     name="Getting Started"
-                    href="../WW/home.html"
+                    href="WW/home.html"
                     />        
             <item
                     name="Tutorials"
-                    href="../WW/tutorials.html"
+                    href="WW/tutorials.html"
                     />        
 
             <item
                     name="FAQs"
-                    href="../WW/faqs.html"
+                    href="WW/faqs.html"
                     />        
 
             <item
                     name="Guides"
-                    href="../WW/guides.html"
+                    href="WW/guides.html"
                     />        
 
             <item
                     name="Release Notes"
-                    href="../WW/release-notes-202.html"
+                    href="cd WW/release-notes-202.html"
                     />        
 
         </menu>
-        <menu name="Reference">
-            <item
-                    name="Struts Core API"
-                    href="struts2-core/apidocs/index.html"
-                    />        
-            <item
-                    name="New API (experimental)"
-                    href="struts2-api/apidocs/index.html"
-                    />        
-            <item
-                    name="Tag Reference"
-                    href="http://struts.apache.org/WW/tag-reference.html"
-                    />        
-        </menu>
 
-        <menu name="Product Support">
+        <menu name="Support">
             <item
                     name="User Mailing List"
                     href="http://struts.apache.org/mail.html"
@@ -80,6 +66,21 @@
             <item
                     name="Wiki Pages"
                     href="http://cwiki.apache.org/S2WIKI/home.html"
+                    />
+        </menu>
+
+        <menu name="Reference">
+            <item
+                    name="Struts Core API"
+                    href="struts2-core/apidocs/index.html"
+                    />
+            <item
+                    name="New API (experimental)"
+                    href="struts2-api/apidocs/index.html"
+                    />
+            <item
+                    name="Tag Reference"
+                    href="http://struts.apache.org/WW/tag-reference.html"
                     />
         </menu>
 

Modified: struts/struts2/trunk/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/src/site/xdoc/index.xml?view=diff&rev=476343&r1=476342&r2=476343
==============================================================================
--- struts/struts2/trunk/src/site/xdoc/index.xml (original)
+++ struts/struts2/trunk/src/site/xdoc/index.xml Fri Nov 17 14:25:42 2006
@@ -14,7 +14,7 @@
             <a name="Welcome"/>
 
         <div style="text-align:left">
-        <a href="../WW/home.html"><img src="images/struts2-merger2.png" alt="Struts 2 and WebWork merger" hspace="16" align="left"/></a>
+        <a href="WW/home.html"><img src="images/struts2-merger2.png" alt="Struts 2 and WebWork merger" hspace="16" align="left"/></a>
         
         <p>       
          <strong>Apache Struts 2 is an elegant, extensible framework</strong> for creating enterprise-ready Java web applications. 
@@ -31,7 +31,7 @@
         </p>      
         <p>
          For more about Apache Struts 2, visit
-         <a href="../WW/home.html">
+         <a href="WW/home.html">
             Getting Started.
          </a>
         </p>
@@ -147,7 +147,7 @@
             <subsection>
             <p>
             For more about Apache Struts 2, visit
-            <a href="../WW/home.html">
+            <a href="WW/home.html">
               Getting Started.
             </a>
             </p>