Author: mrdon
Date: Sat May 6 12:02:13 2006
New Revision: 400350
URL: http://svn.apache.org/viewcvs?rev=400350&view=rev
Log:
Fixed Javadoc links, started adding in Action 2, minor link reorgs
Modified:
struts/site/src/site/site.xml
struts/site/src/site/xdoc/javadoc.xml
Modified: struts/site/src/site/site.xml
URL:
http://svn.apache.org/viewcvs/struts/site/src/site/site.xml?rev=400350&r1=400349&r2=400350&view=diff
==============================================================================
--- struts/site/src/site/site.xml (original)
+++ struts/site/src/site/site.xml Sat May 6 12:02:13 2006
@@ -13,9 +13,9 @@
<body>
<links>
<item name="Apache" href="http://www.apache.org"; />
- <item name="Action" href="http://struts.apache.org/struts-action";
/>
+ <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="Tiles" href="http://struts.apache.org/struts-tiles"; />
</links>
<menu name="Apache Struts Project">
@@ -65,15 +65,16 @@
</menu>
<menu name="Frameworks">
- <item name="Action Framework"
href="http://struts.apache.org/struts-action/index.html"/>
+ <item name="Action 1 Framework"
href="http://struts.apache.org/struts-action/index.html"/>
+ <item name="Action 2 Framework"
href="http://struts.apache.org/struts-action2/index.html"/>
<item name="Shale Framework"
href="http://struts.apache.org/struts-shale/index.html"/>
</menu>
- <menu name="Subprojects">
- <item name="Sandbox"
href="http://struts.apache.org/struts-sandbox/index.html"/>
- </menu>
-
<menu name="Development">
+ <item
+ name="Sandbox"
+ href="http://struts.apache.org/struts-sandbox/index.html";
+ />
<item
name="Charter"
href="bylaws.html"
@@ -124,17 +125,6 @@
<item
name="Struts 1.0.2"
href="http://struts.apache.org/struts-doc-1.0.2/index.html";
- />
- </menu>
-
- <menu name="Incubating">
- <item
- name="WebWork2 as Action2"
- href="http://incubator.apache.org/projects/webwork2.html";
- />
- <item
- name="Confluence instance"
- href="http://confluence.twdata.org/";
/>
</menu>
Modified: struts/site/src/site/xdoc/javadoc.xml
URL:
http://svn.apache.org/viewcvs/struts/site/src/site/xdoc/javadoc.xml?rev=400350&r1=400349&r2=400350&view=diff
==============================================================================
--- struts/site/src/site/xdoc/javadoc.xml (original)
+++ struts/site/src/site/xdoc/javadoc.xml Sat May 6 12:02:13 2006
@@ -29,26 +29,14 @@
<table>
<tr>
<th>
- <a href="struts-action/javadoc.html">Struts
- Action Framework</a>
+ <a href="struts-action/apidocs/index.html">Struts
+ Action Framework 1</a>
</th>
</tr>
<tr>
<th>
<a href="struts-shale/index.html#Shale_Documentation">
Struts Shale Framework</a>
- </th>
- </tr>
- <tr>
- <th>
- <a href="struts-sandbox/apidocs/index.html">Struts
- Sandbox</a>
- </th>
- </tr>
- <tr>
- <th>
- <a href="struts-tiles/apidocs/index.html">Struts
- Tiles</a>
</th>
</tr>
</table>
