From c3cf9d5ec85b5ae331c38893a9014f90decd37b8 Mon Sep 17 00:00:00 2001
From: Ted Nathan Husted <husted@apache.org>
Date: Mon, 22 Jan 2007 11:46:20 +0000
Subject: [PATCH] WW-1650 Add link to migration guide and restore AJAX bullet,
 since they are becoming FAQs.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@498588 13f79535-47bb-0310-9956-ffa450edef68
---
 src/site/xdoc/index.xml | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 8535984f9..2ece7211d 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -36,17 +36,23 @@
          </a>
         </li>
         <li>
-         To download Apache Struts 2, visit
+         To download the framework, visit
          <a href="http://struts.apache.org/download.cgi#struts201">
             Apache Struts Distributions.
          </a>
         </li>
         <li>
-          For more about extensions to Struts 2, visit our 
+          For more about extensions, visit our 
          <a href="http://cwiki.apache.org/S2PLUGINS/home.html">
             Plugin Registry.
          </a>
-        </li></ul>
+        </li>
+        <li>
+          For more about migrating, visit our 
+         <a href="http://struts.apache.org/2.x/docs/migration-guide.html">
+            Migration Guide.
+         </a>
+        </li>        </ul>
         </div>
             
         </section>
@@ -72,8 +78,10 @@
                     <strong>Flexible Cancel Buttons</strong> - Go directly to a different action on cancel. 
                 </li>
                 <li>
-                    <strong>Easy Spring integration</strong> - Struts<sup>2</sup> Actions are Spring-aware. Just 
-                    add Spring beans! (Plexus support is also available.)
+                    <strong>First-class AJAX support</strong> - Add interactivity and flexibility with AJAX tags that look and feel just like standard Struts tags. 
+                </li>
+                <li>
+                    <strong>Easy Spring integration</strong> - Inject dependencies into Actions using Spring without glue code or red tape. (Plexus support also available.)
                 </li>
                 <li>
                     <strong>Enhanced Results</strong> - Do more with speciality results for JasperReports, JFreeChart, Action chaining, and file downloading.  
@@ -87,10 +95,6 @@
                     interface is optional! 
                 </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>
                     strong>Zero Configuration</strong> - Optionally, replace XML configuration with convention and annotation. 
                 </li>
@@ -156,7 +160,7 @@
             </p>
             
             <p>
-            To download Apache Struts 2, visit
+            To download the framework, visit
             <a href="http://struts.apache.org/download.cgi#struts201">
                Apache Struts Distributions
             </a>