From 35ca3085a031317dc82a74bca20ed6fcbbadb396 Mon Sep 17 00:00:00 2001
From: Ted Nathan Husted <husted@apache.org>
Date: Mon, 15 Jan 2007 03:51:57 +0000
Subject: [PATCH] WW-1588. Add link to Plugin registry. Comment out
 experimental features.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@496222 13f79535-47bb-0310-9956-ffa450edef68
---
 src/site/site.xml       | 14 +++++---------
 src/site/xdoc/index.xml | 17 +++++++++++++----
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/site/site.xml b/src/site/site.xml
index 60df1f4a6..237d48b45 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -71,25 +71,21 @@
 
         <menu name="Reference">
             <item
-                    name="Struts Core API"
+                    name="Struts Core and XWork APIs"
                     href="struts2-core/apidocs/index.html"
                     />
-            <item
-                    name="XWork 2 API"
-                    href="xwork-apidocs/index.html"
-                    />
             <item
                     name="Tag Reference"
                     href="docs/tag-reference.html"
                     />
-            <item
-                    name="Plugin Registry"
-                    href="http://cwiki.apache.org/S2PLUGINS/home.html"
-                    />
             <item
                     name="New API (experimental)"
                     href="struts2-api/apidocs/index.html"
                     />
+            <item
+                    name="Plugin Registry"
+                    href="http://cwiki.apache.org/S2PLUGINS/home.html"
+                    />
         </menu>
 
         <menu name="Plugin API's">
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 4d17e8a06..790b392d7 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -41,6 +41,12 @@
             Apache Struts Distributions
          </a>
         </p>
+        <p>
+          For more about extensions to Struts 2, visit our 
+         <a href="http://cwiki.apache.org/S2PLUGINS/home.html">
+            Plugin Registry
+         </a>.
+        </p>
         </div>
             
         </section>
@@ -86,13 +92,15 @@
                     <strong>Easy Spring integration</strong> - Struts<sup>2</sup> Actions are Spring-aware. Just 
                     add Spring beans!
                 </li>
+                <!-- Experimental
                 <li>
                     <strong>First-class AJAX support</strong> - The AJAX theme is backed by the popular Dojo Framework. 
                     AJAX tags look and feel just like standard Struts tags but provide greater interactivity and flexibility. 
                 </li>
                 <li>
-                    <em>Coming in Struts 2.0.2</em> -- <strong>Zero Configuration</strong> - Optionally, replace XML configuration with convention and annotation. 
+                    strong>Zero Configuration</strong> - Optionally, replace XML configuration with convention and annotation. 
                 </li>
+                -->
                 </ul></li>
 
                 <li>
@@ -110,10 +118,11 @@
                 <li>
                     <strong>Integrated profiling</strong> - Peek inside Struts to find the cycles are going!
                 </li>
+                <!-- Experimental
                 <li>
-                    <em>Coming in Struts 2.0.2</em> -- <strong>REST-ful URLs</strong> - Use search-engine friendly URLs, like category/action/movie/Thrillers. 
+                    <strong>REST-ful URLs</strong> - Use search-engine friendly URLs, like category/action/movie/Thrillers. 
                 </li>
-
+                -->
                 </ul></li>
                 <li>
                 <em>Maintain!</em> 
@@ -142,7 +151,7 @@
                     problem reports, and interactive object model queries.
                 </li>
                 <li>
-                    <em>Coming in Struts 2.0.2</em> -- <strong>Precise Error Reporting</strong> - All configuration elements, including properties that come from Java properties files, include location and line information. 
+                    <strong>Precise Error Reporting</strong> - All configuration elements, including properties that come from Java properties files, include location and line information. 
                 </li>
                 </ul></li></ul>