diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml index 6eae2acf6..3eef01b03 100644 --- a/src/site/xdoc/index.xml +++ b/src/site/xdoc/index.xml @@ -15,172 +15,174 @@
Struts 2 and WebWork merger - -

- Apache Struts 2 is an elegant, extensible framework for creating enterprise-ready Java web applications. - The framework is designed to streamline the full development cycle, - from building, to deploying, to maintaining applications over time. -

- +

- Apache Struts 2 was originally known as WebWork 2. - After working independently for several years, - the WebWork and Struts communities joined forces to create Struts2. + Apache Struts 2 is an elegant, extensible framework for creating enterprise-ready Java web applications. + The framework is designed to streamline the full development cycle, + from building, to deploying, to maintaining applications over time. +

+ +

+ Apache Struts 2 was originally known as WebWork 2. + After working independently for several years, + the WebWork and Struts communities joined forces to create Struts2. This new version of Struts is simpler to use and - closer to how Struts was always meant to be. For more about migrating, visit our - - Migration Guide. - -

-
-
- -
- - version 2.0.5 -
- Download Now -
-
-
- - -
- - Get Started - -
-
- - -
- - Plugins Registry - -
-
-
+ closer to how Struts was always meant to be. +

- +
+ +
+ +
+ + version 2.0.6 +
+ Download Now +
+
+
+
+ +
+ + Get Started + +
+
+
+ +
+ + Plugin Registry + +
+
+
- +
- +

+ To download the framework, visit + + Apache Struts Distributions. + For more about Apache Struts 2, visit Getting Started. -

- -

- To download the framework, visit - - Apache Struts Distributions + For more about framework extensions, visit the + + Struts 2 Plugin Registry. + + For help with migrating, visit our + + Migration Guide.

-
- + +
- +

Apache Struts 2 requires:

- +
- +
-

- Apache Struts 2 source code and documentation is +

+ Apache Struts 2 source code and documentation is licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file included in distribution for additional information - regarding copyright ownership. The ASF licenses the source - code and documentation files in our Apache Struts distribution - to you under the Apache License, Version 2.0 (the "License"); + regarding copyright ownership. The ASF licenses the source + code and documentation files in our Apache Struts distribution + to you under the Apache License, Version 2.0 (the "License"); you may not use the Apache Struts product except in compliance - with the License. + with the License.

You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0. -

+

Unless required by applicable law or agreed to in writing, @@ -224,9 +226,9 @@ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations - under the License. -

- -
+ under the License. +

+ +